Leigh Scott
3 years ago
commit
88ad6006c1
@ -0,0 +1,50 @@
|
||||
From 94845266b705dc9de7921408531b9d7704f4458f Mon Sep 17 00:00:00 2001
|
||||
From: Dominic Mayers <dominic.mayers@meditationstudies.org>
|
||||
Date: Sun, 28 Mar 2021 04:37:54 -0400
|
||||
Subject: [PATCH] Get addr by ref. from getConnectionEndpointAddress.
|
||||
|
||||
Fixes issue #25473 in code.videolan.org. The maintainers of live555 changed
|
||||
connectionEndpointAddresss to getConnectionEndpointAddress, which now provides
|
||||
the address value by reference. Before, connectionEndpointAddresss returned
|
||||
the value. So, in modules/access/live555.cpp, we must first get the value and
|
||||
then pass it to IsMulticastAddress. The code will not compile with the recent
|
||||
live555 unless we also modify modules/access/Makefile.am - a different patch.
|
||||
---
|
||||
modules/access/live555.cpp | 7 +++++--
|
||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
|
||||
index 01c535ca5b..95e15e35d9 100644
|
||||
--- a/modules/access/live555.cpp
|
||||
+++ b/modules/access/live555.cpp
|
||||
@@ -60,6 +60,7 @@
|
||||
#include <liveMedia.hh>
|
||||
#include <liveMedia_version.hh>
|
||||
#include <Base64.hh>
|
||||
+#include <NetAddress.hh>
|
||||
|
||||
extern "C" {
|
||||
#include "../access/mms/asf.h" /* Who said ugly ? */
|
||||
@@ -727,7 +728,8 @@ static int SessionsSetup( demux_t *p_demux )
|
||||
unsigned const thresh = 200000; /* RTP reorder threshold .2 second (default .1) */
|
||||
const char *p_sess_lang = NULL;
|
||||
const char *p_lang;
|
||||
-
|
||||
+ struct sockaddr_storage addr;
|
||||
+
|
||||
b_rtsp_tcp = var_CreateGetBool( p_demux, "rtsp-tcp" ) ||
|
||||
var_GetBool( p_demux, "rtsp-http" );
|
||||
i_client_port = var_InheritInteger( p_demux, "rtp-client-port" );
|
||||
@@ -850,7 +852,8 @@ static int SessionsSetup( demux_t *p_demux )
|
||||
if( !p_sys->b_multicast )
|
||||
{
|
||||
/* We need different rollover behaviour for multicast */
|
||||
- p_sys->b_multicast = IsMulticastAddress( sub->connectionEndpointAddress() );
|
||||
+ sub->getConnectionEndpointAddress(addr);
|
||||
+ p_sys->b_multicast = IsMulticastAddress( addr );
|
||||
}
|
||||
|
||||
tk = (live_track_t*)malloc( sizeof( live_track_t ) );
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@ -0,0 +1,98 @@
|
||||
diff -uNrp a/modules/video_output/caca.c b/modules/video_output/caca.c
|
||||
--- a/modules/video_output/caca.c 2022-01-14 06:09:28.000000000 +0000
|
||||
+++ b/modules/video_output/caca.c 2022-01-18 23:09:44.979137301 +0000
|
||||
@@ -74,9 +74,9 @@ static void Place(vout_display_t *, vout
|
||||
|
||||
/* */
|
||||
struct vout_display_sys_t {
|
||||
- cucul_canvas_t *cv;
|
||||
+ caca_canvas_t *cv;
|
||||
caca_display_t *dp;
|
||||
- cucul_dither_t *dither;
|
||||
+ caca_dither_t *dither;
|
||||
|
||||
picture_pool_t *pool;
|
||||
vout_display_event_thread_t *et;
|
||||
@@ -153,9 +153,9 @@ static int Open(vlc_object_t *object)
|
||||
if (!sys)
|
||||
goto error;
|
||||
|
||||
- sys->cv = cucul_create_canvas(0, 0);
|
||||
+ sys->cv = caca_create_canvas(0, 0);
|
||||
if (!sys->cv) {
|
||||
- msg_Err(vd, "cannot initialize libcucul");
|
||||
+ msg_Err(vd, "cannot initialize libcaca");
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -209,11 +209,11 @@ error:
|
||||
if (sys->pool)
|
||||
picture_pool_Release(sys->pool);
|
||||
if (sys->dither)
|
||||
- cucul_free_dither(sys->dither);
|
||||
+ caca_free_dither(sys->dither);
|
||||
if (sys->dp)
|
||||
caca_free_display(sys->dp);
|
||||
if (sys->cv)
|
||||
- cucul_free_canvas(sys->cv);
|
||||
+ caca_free_canvas(sys->cv);
|
||||
|
||||
free(sys);
|
||||
}
|
||||
@@ -235,9 +235,9 @@ static void Close(vlc_object_t *object)
|
||||
if (sys->pool)
|
||||
picture_pool_Release(sys->pool);
|
||||
if (sys->dither)
|
||||
- cucul_free_dither(sys->dither);
|
||||
+ caca_free_dither(sys->dither);
|
||||
caca_free_display(sys->dp);
|
||||
- cucul_free_canvas(sys->cv);
|
||||
+ caca_free_canvas(sys->cv);
|
||||
|
||||
#if defined(_WIN32)
|
||||
FreeConsole();
|
||||
@@ -266,7 +266,7 @@ static void Prepare(vout_display_t *vd,
|
||||
|
||||
if (!sys->dither) {
|
||||
/* Create the libcaca dither object */
|
||||
- sys->dither = cucul_create_dither(32,
|
||||
+ sys->dither = caca_create_dither(32,
|
||||
vd->source.i_visible_width,
|
||||
vd->source.i_visible_height,
|
||||
picture->p[0].i_pitch,
|
||||
@@ -284,12 +284,12 @@ static void Prepare(vout_display_t *vd,
|
||||
vout_display_place_t place;
|
||||
Place(vd, &place);
|
||||
|
||||
- cucul_set_color_ansi(sys->cv, CUCUL_COLOR_DEFAULT, CUCUL_COLOR_BLACK);
|
||||
- cucul_clear_canvas(sys->cv);
|
||||
+ caca_set_color_ansi(sys->cv, CACA_DEFAULT, CACA_BLACK);
|
||||
+ caca_clear_canvas(sys->cv);
|
||||
|
||||
const int crop_offset = vd->source.i_y_offset * picture->p->i_pitch +
|
||||
vd->source.i_x_offset * picture->p->i_pixel_pitch;
|
||||
- cucul_dither_bitmap(sys->cv, place.x, place.y,
|
||||
+ caca_dither_bitmap(sys->cv, place.x, place.y,
|
||||
place.width, place.height,
|
||||
sys->dither,
|
||||
&picture->p->p_pixels[crop_offset]);
|
||||
@@ -328,7 +328,7 @@ static int Control(vout_display_t *vd, i
|
||||
|
||||
case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
|
||||
if (sys->dither)
|
||||
- cucul_free_dither(sys->dither);
|
||||
+ caca_free_dither(sys->dither);
|
||||
sys->dither = NULL;
|
||||
return VLC_SUCCESS;
|
||||
|
||||
@@ -366,8 +366,8 @@ static void Place(vout_display_t *vd, vo
|
||||
|
||||
vout_display_PlacePicture(place, &vd->source, vd->cfg, false);
|
||||
|
||||
- const int canvas_width = cucul_get_canvas_width(sys->cv);
|
||||
- const int canvas_height = cucul_get_canvas_height(sys->cv);
|
||||
+ const int canvas_width = caca_get_canvas_width(sys->cv);
|
||||
+ const int canvas_height = caca_get_canvas_height(sys->cv);
|
||||
const int display_width = caca_get_display_width(sys->dp);
|
||||
const int display_height = caca_get_display_height(sys->dp);
|
||||
|
||||
@ -1 +1 @@
|
||||
SHA512 (vlc-3.0.16.tar.xz) = 35cdf191071224d0cf1b5a83c00773ff87b9e5bfcf0f5523f7edd53f75b23eda6b27bb49ffa97d69a1d176b8fe4786d959aeeb00d4380beab71c9f7e6b7c7298
|
||||
SHA512 (vlc-758b718.tar.gz) = 02dc1f6a9516e7bbb2ed0dd04b57a0e944435847bcde32770370a24563234134f3b08755769a98437d33ebd32a517c32324fd6635173c5793442bd36f100e8c7
|
||||
|
||||
Loading…
Reference in new issue