August 2015 - MPlayer-dev-eng - lists.mplayerhq.hu

[PATCH] vdpau: Remove last traces of old ffmpeg vdpau api
by Philip Langdale 04 Oct '15

04 Oct '15

From: Philip Langdale <philipl(a)cloudera.com> mplayer was switched to the new api a while ago, but retained traces of it in a few places - primarily through retaining vdpau_render_state as a trivial wrapper for a VdpVideoSurface. This change removes all these remaining traces. Signed-off-by: Philip Langdale <philipl(a)overt.org> --- fmt-conversion.c | 6 ---- libmpcodecs/img_format.h | 3 +- libmpcodecs/vd_ffmpeg.c | 13 +++------ libvo/vo_vdpau.c | 75 +++++++++++++++++++++++++----------------------- 4 files changed, 45 insertions(+), 52 deletions(-) diff --git a/fmt-conversion.c b/fmt-conversion.c index 0cf2bda..e51c29b 100644 --- a/fmt-conversion.c +++ b/fmt-conversion.c @@ -137,12 +137,6 @@ static const struct { { IMGFMT_444P, AV_PIX_FMT_YUVJ444P }, { IMGFMT_440P, AV_PIX_FMT_YUVJ440P }, { IMGFMT_XVMC_IDCT_MPEG2, AV_PIX_FMT_XVMC }, - { IMGFMT_VDPAU_MPEG1, AV_PIX_FMT_VDPAU_MPEG1 }, - { IMGFMT_VDPAU_MPEG2, AV_PIX_FMT_VDPAU_MPEG2 }, - { IMGFMT_VDPAU_H264, AV_PIX_FMT_VDPAU_H264 }, - { IMGFMT_VDPAU_WMV3, AV_PIX_FMT_VDPAU_WMV3 }, - { IMGFMT_VDPAU_VC1, AV_PIX_FMT_VDPAU_VC1 }, - { IMGFMT_VDPAU_MPEG4, AV_PIX_FMT_VDPAU_MPEG4 }, { 0, AV_PIX_FMT_NONE } }; diff --git a/libmpcodecs/img_format.h b/libmpcodecs/img_format.h index 68581f5..582ecee 100644 --- a/libmpcodecs/img_format.h +++ b/libmpcodecs/img_format.h @@ -20,6 +20,7 @@ #define MPLAYER_IMG_FORMAT_H #include "config.h" +#include <inttypes.h> /* RGB/BGR Formats */ @@ -302,7 +303,7 @@ typedef struct { } vo_mpegpes_t; struct vdpau_frame_data { - struct vdpau_render_state *render_state; + uint32_t surface; const void *info; unsigned bitstream_buffers_used; const void *bitstream_buffers; diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index c515d0a..f1a57b9 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -216,7 +216,7 @@ static int vdpau_render_wrapper(AVCodecContext *s, AVFrame *f, sh_video_t *sh = s->opaque; struct vdpau_frame_data data; uint8_t *planes[4] = {(void *)&data}; - data.render_state = mpi->priv; + data.surface = (uintptr_t)mpi->priv; data.info = info; data.bitstream_buffers_used = count; data.bitstream_buffers = buffers; @@ -558,8 +558,7 @@ static void draw_slice(struct AVCodecContext *s, } #if CONFIG_VDPAU if (mpi && IMGFMT_IS_VDPAU(mpi->imgfmt)) { - struct vdpau_render_state *render = mpi->priv; - vdpau_render_wrapper(s, src, &render->info, render->bitstream_buffers_used, render->bitstream_buffers); + mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "BUG in FFmpeg, draw_slice called for old-style VDPAU!\n"); return; } #endif @@ -764,9 +763,9 @@ static int get_buffer(AVCodecContext *avctx, AVFrame *pic){ } #if CONFIG_VDPAU if (ctx->use_hwaccel) { - struct vdpau_render_state *render = mpi->priv; + VdpVideoSurface surface = (uintptr_t)mpi->priv; avctx->draw_horiz_band= NULL; - mpi->planes[3] = render->surface; + mpi->planes[3] = surface; } #endif #if CONFIG_XVMC @@ -1128,10 +1127,6 @@ static enum AVPixelFormat get_format(struct AVCodecContext *avctx, if (fmt[i] == ctx->pix_fmt) return ctx->pix_fmt; for(i=0;fmt[i]!=AV_PIX_FMT_NONE;i++){ - // it is incorrect of FFmpeg to even offer these, filter them out - if(!(avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) && - (fmt[i] == AV_PIX_FMT_VDPAU_MPEG1 || fmt[i] == AV_PIX_FMT_VDPAU_MPEG2)) - continue; imgfmt = pixfmt2imgfmt2(fmt[i], avctx->codec_id); if(!IMGFMT_IS_HWACCEL(imgfmt) || !is_in_format_list(sh, imgfmt)) continue; mp_msg(MSGT_DECVIDEO, MSGL_V, MSGTR_MPCODECS_TryingPixfmt, i); diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c index f9a8057..322a66c 100644 --- a/libvo/vo_vdpau.c +++ b/libvo/vo_vdpau.c @@ -174,7 +174,7 @@ static VdpRect src_rect_vid; static VdpRect out_rect_vid; static int border_l, border_r, border_t, border_b; -static struct vdpau_render_state surface_render[MAX_VIDEO_SURFACES]; +static VdpVideoSurface surface_render[MAX_VIDEO_SURFACES]; static int surface_num; static int vid_surface_num; static uint32_t vid_width, vid_height; @@ -251,7 +251,7 @@ static void video_to_output_surface(void) return; if (deint < 2 || deint_surfaces[0] == VDP_INVALID_HANDLE) - push_deint_surface(surface_render[vid_surface_num].surface); + push_deint_surface(surface_render[vid_surface_num]); for (i = 0; i <= !!(deint > 1); i++) { int field = VDP_VIDEO_MIXER_PICTURE_STRUCTURE_FRAME; @@ -274,12 +274,12 @@ static void video_to_output_surface(void) vdp_st = vdp_video_mixer_render(video_mixer, VDP_INVALID_HANDLE, 0, field, 2, deint_surfaces + 1, deint_surfaces[0], - 1, &surface_render[vid_surface_num].surface, + 1, &surface_render[vid_surface_num], &src_rect_vid, output_surface, NULL, &out_rect_vid, 0, NULL); CHECK_ST_WARNING("Error when calling vdp_video_mixer_render") - push_deint_surface(surface_render[vid_surface_num].surface); + push_deint_surface(surface_render[vid_surface_num]); } } @@ -579,11 +579,11 @@ static void free_video_specific(void) } for (i = 0; i < MAX_VIDEO_SURFACES; i++) { - if (surface_render[i].surface != VDP_INVALID_HANDLE) { - vdp_st = vdp_video_surface_destroy(surface_render[i].surface); + if (surface_render[i] != VDP_INVALID_HANDLE) { + vdp_st = vdp_video_surface_destroy(surface_render[i]); CHECK_ST_WARNING("Error when calling vdp_video_surface_destroy") } - surface_render[i].surface = VDP_INVALID_HANDLE; + surface_render[i] = VDP_INVALID_HANDLE; } if (video_mixer != VDP_INVALID_HANDLE) { @@ -620,7 +620,7 @@ static int create_vdp_decoder(uint32_t format, uint32_t width, uint32_t height, case IMGFMT_VDPAU_MPEG4: vdp_decoder_profile = VDP_DECODER_PROFILE_MPEG4_PART2_ASP; break; -#ifdef VDP_DECODER_PROFILE_HEVC_MAIN; +#ifdef VDP_DECODER_PROFILE_HEVC_MAIN case IMGFMT_VDPAU_HEVC: vdp_decoder_profile = VDP_DECODER_PROFILE_HEVC_MAIN; mp_msg(MSGT_VO, MSGL_V, "[vdpau] Creating HEVC hardware decoder for %d reference frames.\n", max_refs); @@ -647,7 +647,7 @@ static void mark_vdpau_objects_uninitialized(void) int i; for (i = 0; i < MAX_VIDEO_SURFACES; i++) - surface_render[i].surface = VDP_INVALID_HANDLE; + surface_render[i] = VDP_INVALID_HANDLE; vdp_flip_queue = VDP_INVALID_HANDLE; vdp_flip_target = VDP_INVALID_HANDLE; for (i = 0; i <= NUM_OUTPUT_SURFACES; i++) @@ -1015,7 +1015,7 @@ static void flip_page(void) { VdpStatus vdp_st; mp_msg(MSGT_VO, MSGL_DBG2, "\nFLIP_PAGE VID:%u -> OUT:%u\n", - surface_render[vid_surface_num].surface, output_surfaces[surface_num]); + surface_render[vid_surface_num], output_surfaces[surface_num]); if (handle_preemption() < 0) return; @@ -1055,34 +1055,45 @@ static int draw_slice(uint8_t *image[], int stride[], int w, int h, && !create_vdp_decoder(image_format, vid_width, vid_height, max_refs)) return VO_FALSE; - vdp_st = vdp_decoder_render(decoder, rndr->render_state->surface, rndr->info, rndr->bitstream_buffers_used, rndr->bitstream_buffers); + vdp_st = vdp_decoder_render(decoder, rndr->surface, rndr->info, rndr->bitstream_buffers_used, rndr->bitstream_buffers); CHECK_ST_WARNING("Failed VDPAU decoder rendering"); return VO_TRUE; } +static int get_surface_idx(VdpVideoSurface surface) +{ + int i; + for (i = 0; i < MAX_VIDEO_SURFACES; i++) { + if (surface == surface_render[i]) { + return i; + } + } + mp_msg(MSGT_VO, MSGL_FATAL, "Unknown VdpVideoSurface %u!\n", surface); + return -1; +} -static struct vdpau_render_state *get_surface(int number) +static VdpVideoSurface get_surface(int number) { if (number >= MAX_VIDEO_SURFACES) - return NULL; - if (surface_render[number].surface == VDP_INVALID_HANDLE) { + return VDP_INVALID_HANDLE; + if (surface_render[number] == VDP_INVALID_HANDLE) { VdpStatus vdp_st; vdp_st = vdp_video_surface_create(vdp_device, vdp_chroma_type, vid_width, vid_height, - &surface_render[number].surface); + &surface_render[number]); CHECK_ST_WARNING("Error when calling vdp_video_surface_create") if (vdp_st != VDP_STATUS_OK) - return NULL; + return VDP_INVALID_HANDLE; } - mp_msg(MSGT_VO, MSGL_DBG2, "VID CREATE: %u\n", surface_render[number].surface); - return &surface_render[number]; + mp_msg(MSGT_VO, MSGL_DBG2, "VID CREATE: %u\n", surface_render[number]); + return surface_render[number]; } static uint32_t draw_image(mp_image_t *mpi) { if (IMGFMT_IS_VDPAU(image_format)) { - struct vdpau_render_state *rndr = mpi->priv; - vid_surface_num = rndr - surface_render; + VdpVideoSurface surface = (uintptr_t)mpi->priv; + vid_surface_num = get_surface_idx(surface); mpi->usage_count++; if (deint_mpi[1]) deint_mpi[1]->usage_count--; @@ -1098,12 +1109,12 @@ static uint32_t draw_image(mp_image_t *mpi) } else if (!(mpi->flags & MP_IMGFLAG_DRAW_CALLBACK)) { VdpStatus vdp_st; void *destdata[3] = {mpi->planes[0], mpi->planes[2], mpi->planes[1]}; - struct vdpau_render_state *rndr = get_surface(deint_counter); + VdpVideoSurface surface = get_surface(deint_counter); deint_counter = (deint_counter + 1) % 3; - vid_surface_num = rndr - surface_render; + vid_surface_num = get_surface_idx(surface); if (image_format == IMGFMT_NV12) destdata[1] = destdata[2]; - vdp_st = vdp_video_surface_put_bits_y_cb_cr(rndr->surface, + vdp_st = vdp_video_surface_put_bits_y_cb_cr(surface, vdp_pixel_format, (const void *const*)destdata, mpi->stride); // pitch @@ -1120,7 +1131,7 @@ static uint32_t draw_image(mp_image_t *mpi) static uint32_t get_image(mp_image_t *mpi) { - struct vdpau_render_state *rndr; + VdpVideoSurface surface; // no dr for non-decoding for now if (!IMGFMT_IS_VDPAU(image_format)) @@ -1128,8 +1139,8 @@ static uint32_t get_image(mp_image_t *mpi) if (mpi->type != MP_IMGTYPE_NUMBERED) return VO_FALSE; - rndr = get_surface(mpi->number); - if (!rndr) { + surface = get_surface(mpi->number); + if (surface == VDP_INVALID_HANDLE) { mp_msg(MSGT_VO, MSGL_ERR, "[vdpau] no surfaces available in get_image\n"); // TODO: this probably breaks things forever, provide a dummy buffer? return VO_FALSE; @@ -1138,9 +1149,9 @@ static uint32_t get_image(mp_image_t *mpi) mpi->stride[0] = mpi->stride[1] = mpi->stride[2] = 0; mpi->planes[0] = mpi->planes[1] = mpi->planes[2] = NULL; // hack to get around a check and to avoid a special-case in vd_ffmpeg.c - mpi->planes[0] = (void *)rndr; + mpi->planes[0] = (void *)(uintptr_t)surface; mpi->num_planes = 1; - mpi->priv = rndr; + mpi->priv = (void *)(uintptr_t)surface; return VO_TRUE; } @@ -1214,18 +1225,10 @@ static void DestroyVdpauObjects(void) static void uninit(void) { - int i; - if (!vo_config_count) return; visible_buf = 0; - for (i = 0; i < MAX_VIDEO_SURFACES; i++) { - // Allocated in ff_vdpau_add_data_chunk() - av_freep(&surface_render[i].bitstream_buffers); - surface_render[i].bitstream_buffers_allocated = 0; - } - /* Destroy all vdpau objects */ DestroyVdpauObjects(); -- 2.1.4

4 8

New MPlayer release soon
by Roberto Togni 03 Oct '15

03 Oct '15

Hi all. I'd like to do a new release of MPlayer, using the soon to be released FFmpeg 2.8. This will be the last FFmpeg release before a lot of old APIs are dropped; since the support in MPlayer for their replacement is very new it would be good to have a stable version in case of problems. Also some features will have to be removed in MPlayer after (eg. XvMC, lavfi ulnless it's rewritten), because of incompatibilities or deprecation. If you have anything that you want to get into the release please speak now and commit it; the same if you want to suggest that something is removed or dropped. Also reports about blocking issues are welcome. I will open some other threads about websites updates and such. Ciao, Roberto

5 19

Homepage skin download issue
by Ingo Brückl 09 Sep '15

09 Sep '15

Yesterday, I updated hwswskin to 1.3, but it still isn't downloadable. Is the generation of the skin download tarballs working? Ingo

3 8

[PATCH]Win32: correct the encoding of filename in console message
by 朱海 06 Sep '15

06 Sep '15

1) In Win32, the filename is converted to UTF-8 encoding and stored in memory, but it's not converted back correctly when writing console messages. This patch converts the filename to suitable encoding before output to console. I compiled the code under Ubuntu with mingw, and test under Windows 10 with charset CP936, iconv enabled/disabled. 2) When building Linux x86_64 STATIC version mplayer, I got a link error at the last step and fixed it by adding '-lXau' to config.mak by hand. But I am not sure if this is a platform dependent issue or not (Ubuntu 15.04), anyone can help check and fix it ? I'm not very familiar with config system -.- build commands: ./configure --enable-static make -j6 Error messages: /usr/lib/gcc/x86_64-linux-gnu/4.9/../../../x86_64-linux-gnu/libaudio.a(ConnSvr.o): In function `_AuConnectServer': (.text+0x934): undefined reference to `XauDisposeAuth' /usr/lib/gcc/x86_64-linux-gnu/4.9/../../../x86_64-linux-gnu/libaudio.a(ConnSvr.o): In function `_AuConnectServer': (.text+0x9dc): undefined reference to `XauGetBestAuthByAddr' Here is the patch fixes filename encoding issue: Index: mp_msg.c =================================================================== diff --git a/trunk/mp_msg.c b/trunk/mp_msg.c --- a/trunk/mp_msg.c (revision 37444) +++ b/trunk/mp_msg.c (working copy) @@ -30,6 +30,11 @@ #include <errno.h> #endif +#if defined(__MINGW32__) || defined(__CYGWIN__) +#include <windows.h> +#include "mpcommon.h" +#endif + #include "mp_msg.h" /* maximum message length of mp_msg */ @@ -46,21 +51,19 @@ static iconv_t msgiconv; #endif -const char* filename_recode(const char* filename) +#if defined(CONFIG_ICONV) && defined(MSG_CHARSET) +static const char *convert_charset(const char* filename, const char *to, const char *from) { -#if !defined(CONFIG_ICONV) || !defined(MSG_CHARSET) - return filename; -#else static iconv_t inv_msgiconv = (iconv_t)(-1); static char recoded_filename[MSGSIZE_MAX]; size_t filename_len, max_path; char* precoded; - if (!mp_msg_charset || - !strcasecmp(mp_msg_charset, MSG_CHARSET) || - !strcasecmp(mp_msg_charset, "noconv")) + if (!from || !to || + !strcasecmp(from, to) || + !strcasecmp(from, "noconv")) return filename; if (inv_msgiconv == (iconv_t)(-1)) { - inv_msgiconv = iconv_open(MSG_CHARSET, mp_msg_charset); + inv_msgiconv = iconv_open(to, from); if (inv_msgiconv == (iconv_t)(-1)) return filename; } @@ -67,7 +70,7 @@ filename_len = strlen(filename); max_path = MSGSIZE_MAX - 4; precoded = recoded_filename; - if (iconv(inv_msgiconv, &filename, &filename_len, + if (iconv(inv_msgiconv, (char **)&filename, &filename_len, &precoded, &max_path) == (size_t)(-1) && errno == E2BIG) { precoded[0] = precoded[1] = precoded[2] = '.'; precoded += 3; @@ -74,9 +77,70 @@ } *precoded = '\0'; return recoded_filename; +} + #endif + +#if defined(__MINGW32__) || defined(__CYGWIN__) + +// convert filename to system default charset +static const char * win_default_charset(const char* filename) +{ + int cnt; + wchar_t fname_w[MSGSIZE_MAX]; + static char recoded_filename[MSGSIZE_MAX]; + typedef int WINAPI (*PWC2MB)(UINT, DWORD, LPCWSTR, int, LPSTR, int, LPCSTR, LPBOOL); + typedef int WINAPI (*PMB2WC)(UINT, DWORD, LPCSTR, int, LPWSTR, int); + PWC2MB wc2mb; + PMB2WC mb2wc; + + HMODULE WINAPI kernel32 = GetModuleHandle("Kernel32.dll"); + if (!kernel32) goto fallback; + + mb2wc = (PMB2WC)GetProcAddress(kernel32, "MultiByteToWideChar"); + wc2mb = (PWC2MB)GetProcAddress(kernel32, "WideCharToMultiByte"); + if (!mb2wc || !wc2mb) goto fallback; + cnt = mb2wc(CP_UTF8, MB_ERR_INVALID_CHARS, filename, -1, fname_w, sizeof(fname_w) / sizeof(*fname_w)); + if (cnt <= 0) goto fallback; + + cnt = wc2mb(CP_ACP, 0, fname_w, -1, recoded_filename, sizeof(recoded_filename) / sizeof(char), NULL, NULL); + if (cnt <= 0) goto fallback; + return recoded_filename; + +fallback: + return filename; } +#endif +// if have iconv and msg_charset, ensure the filename is 'msg_charset' encoding +// if no iconv nor msg_charset, keep it as system default encoding +const char* filename_recode(const char* filename) +{ +#if !defined(CONFIG_ICONV) || !defined(MSG_CHARSET) + +#if defined(__MINGW32__) || defined(__CYGWIN__) + if (win32_use_utf8) + return win_default_charset(filename); +#endif + return filename; + +#else // CONFIG_ICONV && MSG_CHARSET + +#if defined(__MINGW32__) || defined(__CYGWIN__) + if (win32_use_utf8) { + if (!mp_msg_charset || !strcasecmp(mp_msg_charset, "noconv")) { + return win_default_charset(filename); + } + if (!strcasecmp(MSG_CHARSET, "UTF-8") || !strcasecmp(MSG_CHARSET, "UTF8")) + return filename; + return convert_charset(filename, MSG_CHARSET, "UTF-8"); + } +#endif // fallback if not using utf8 filename for win32 + + return convert_charset(filename, MSG_CHARSET, mp_msg_charset); +#endif +} + void mp_msg_init(void){ int i; char *env = getenv("MPLAYER_VERBOSE"); @@ -198,7 +262,8 @@ tmp[MSGSIZE_MAX-1] = 0; #if defined(CONFIG_ICONV) && defined(MSG_CHARSET) - if (mp_msg_charset && strcasecmp(mp_msg_charset, "noconv")) { + if (mp_msg_charset && strcasecmp(mp_msg_charset, "noconv") + && strcasecmp(mp_msg_charset, MSG_CHARSET)) { char tmp2[MSGSIZE_MAX]; size_t inlen = strlen(tmp), outlen = MSGSIZE_MAX; char *in = tmp, *out = tmp2; Index: mpcommon.c =================================================================== diff --git a/trunk/mpcommon.c b/trunk/mpcommon.c --- a/trunk/mpcommon.c (revision 37444) +++ b/trunk/mpcommon.c (working copy) @@ -466,7 +466,10 @@ {NULL, NULL, 0, 0, 0, 0, NULL} }; -#ifdef __MINGW32__ +#if defined(__MINGW32__) || defined(__CYGWIN__) + +int win32_use_utf8 = 0; + static int get_win32_cmdline(int *argc_ptr, char **argv_ptr[]) { int i; @@ -524,6 +527,9 @@ *argc_ptr = argc_n; *argv_ptr = argv_n; LocalFree(argv_w); + + win32_use_utf8 = 1; + return 0; err_out: Index: mpcommon.h =================================================================== diff --git a/trunk/mpcommon.h b/trunk/mpcommon.h --- a/trunk/mpcommon.h (revision 37444) +++ b/trunk/mpcommon.h (working copy) @@ -70,6 +70,10 @@ extern m_config_t *mconfig; extern const m_option_t noconfig_opts[]; +#if defined(__MINGW32__) || defined(__CYGWIN__) +extern int win32_use_utf8; +#endif + void print_version(const char* name); void init_vo_spudec(struct stream *stream, struct sh_video *sh_video, struct sh_sub *sh_sub); void update_subtitles(struct sh_video *sh_video, double refpts, demux_stream_t *d_dvdsub, int reset); Index: stream/stream_file.c =================================================================== diff --git a/trunk/stream/stream_file.c b/trunk/stream/stream_file.c --- a/trunk/stream/stream_file.c (revision 37444) +++ b/trunk/stream/stream_file.c (working copy) @@ -26,9 +26,10 @@ #if HAVE_SETMODE #include <io.h> #endif -#ifdef __MINGW32__ +#if defined(__MINGW32__) || defined(__CYGWIN__) #include <windows.h> #include <share.h> +#include "mpcommon.h" #endif #include "mp_msg.h" @@ -120,7 +121,7 @@ return STREAM_UNSUPPORTED; } -#ifdef __MINGW32__ +#if defined(__MINGW32__) || defined(__CYGWIN__) static int win32_open(const char *fname, int m, int omode) { int cnt; @@ -127,7 +128,11 @@ int fd = -1; wchar_t fname_w[MAX_PATH]; int WINAPI (*mb2wc)(UINT, DWORD, LPCSTR, int, LPWSTR, int) = NULL; - HMODULE kernel32 = GetModuleHandle("Kernel32.dll"); + HMODULE kernel32; + + if (!win32_use_utf8) goto fallback; + + kernel32 = GetModuleHandle("Kernel32.dll"); if (!kernel32) goto fallback; mb2wc = GetProcAddress(kernel32, "MultiByteToWideChar"); if (!mb2wc) goto fallback;

4 4

[RFC][PATCH] Replace deprecated get_buffer, buffer_hints, and others
by Roberto Togni 05 Sep '15

05 Sep '15

Hi, Just joking, I'm not really replacing them. This is my proposed solution to the problem, that just drops dr for lavc codecs (except hwaccel). Why this? - modern codecs (eg. h264) are not compatible with the direct rendering structure of mplayer (IPB frames, 2 IP 1 B). It may be possible to do direct rendering for non-reference frames, but that also was already non functional (disabled because of some bugs) - dr is already failing today with most codecs, because of missing buffer_hints and reference flag. It fails also for things like mpeg2. Nobody complained. - dr is functional today for old simple codecs (eg. rpza), but performance is not relevant for someting written to run on a 386. - without buffer hints, I have no idea how to map the lavc frames to our frames, even when this could be possible (eg. mpeg2) - Wrapping our data structures in AVBuffers is a mess I have a patch that can replicate the behaviour of today (try dr and fail usually at the 2nd frame) with the new get_buffer2, if anybody is interested (I just need to clean it up). But I don't suggest to take this route. What about hwaccel? The hwaccel portion of the code is there, and may work. But I never used hwaccel, and I don't even know if my gpu (integrated into i7 Sandybridge) is supported by MPlayer hw acceleration. So somebody who has a clue about hwaccel should review and test it. This patch is just for comments; there is still a lot of code that is now useless but not removed yet, but it's late and I want to see what other MPlayer devels think about it. As usual it works for me, but I just did limited testing. If there is agreement on this solution I will clean it up and submit a proper patch. Ciao, Roberto

2 4

[PATCH] Automatically detect the first media data track in the cue driver
by Ingo Brückl 26 Aug '15

26 Aug '15

The first track of a Video CD usually stores metadata inside an ISO 9660 filesystem and media data starts from track 2. However, the ISO 9660 filesystem can be absent and media data can start from track 1. (Audio CD images always start with track 1.) To find out which track to start playback with (if no track has been given), check for an ISO 9660 filesystem in track 1 instead of using track 1 unconditionally. Ingo

1 0

[PATCH] Replace deprecated avcodec resamples with libswresample in af_lavcresample
by Roberto Togni 25 Aug '15

25 Aug '15

Hello, this patch updates af_lavcresample to use libswresample instead of the deprecated avcodec resampler (resample2). It works for me; please test, it especially with multichannel setup. Ciao, Roberto

5 8

[PATCH] mpcodecs/ve_lavc: Remove uses of CODEC_FLAG_MV0 as its deprecated
by Michael Niedermayer 23 Aug '15

23 Aug '15

From: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libmpcodecs/ve_lavc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index 6ab565c..f83661d 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -273,7 +273,7 @@ const m_option_t lavcopts_conf[]={ {"intra_matrix", &lavc_param_intra_matrix, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"inter_matrix", &lavc_param_inter_matrix, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"cbp", "Please use o=mpv_flags=+cbp_rd instead of cbp.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, - {"mv0", &lavc_param_mv0, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0, NULL}, + {"mv0", "Please use o=mpv_flags=+mv0 instead of mv0.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"nr", &lavc_param_noise_reduction, CONF_TYPE_INT, CONF_RANGE, 0, 1000000, NULL}, {"qprd", "Please use o=mpv_flags=+qp_rd instead of qprd.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"ss", &lavc_param_ss, CONF_TYPE_FLAG, 0, 0, 1, NULL}, @@ -641,7 +641,7 @@ static int config(struct vf_instance *vf, lavc_venc_context->flags &= ~CODEC_FLAG_QPEL; lavc_venc_context->flags &= ~CODEC_FLAG_4MV; lavc_venc_context->trellis = 0; - lavc_venc_context->flags &= ~CODEC_FLAG_MV0; + av_dict_set(&opts, "mpv_flags", "-mv0", 0); av_dict_set(&opts, "mpv_flags", "-qp_rd-cbp_rd", 0); } break; -- 1.7.9.5

2 1

[PATCH] Replace deprecated av_encode_video() with av_encode_video2()
by Roberto Togni 23 Aug '15

23 Aug '15

Hi, this patch replaces all the instances of the deprecated av_encode_video() with av_encode_video2(). Thanks to Andreas Cadhalpun for pointing this out. Will commit soon if no objections. Ciao, Roberto

1 1

[PATCH] etc/codecs.conf: Mark vdpau hevc acceleration as working
by Philip Langdale 23 Aug '15

23 Aug '15

This works correctly with the latest 355.06 nvidia drivers --- etc/codecs.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/codecs.conf b/etc/codecs.conf index 8a50507..a5238e7 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -1400,7 +1400,7 @@ videocodec ffhevc videocodec ffhevcvdpau info "FFmpeg HEVC / H.265 (VDPAU)" - status buggy + status working fourcc HEVC fourcc hvc1 fourcc hev1 -- 2.1.4

2 1

[PATCH] Stop using deprecatet AVPacket.destruct
by Roberto Togni 17 Aug '15

17 Aug '15

Hi, this patch drops the usage of the destruct field in AVPacket from demuxer_lavf. Thanks to Andreas Cadhalpun for reporting it. I haven't found an easy way to replace it; since now AVPacket.data is a pointer into an AVBuffer (and not a plain malloc'd buffer), we can't just seal it like we did before and free it later. The removed path was just an optimization to avoid copying the demuxed packet data. Also note that because of the way the condition is written, the removed code was already inactive (we compare the destruct field with av_destruct_packet to enable it, but lavc now sets it to dummy_destruct_packer). Will apply shortly if no complain. Ciao, Roberto

2 2

Re: [MPlayer-dev-eng] [FFmpeg-devel] [PATCH 0/20] removal of deprecated features
by compn 15 Aug '15

15 Aug '15

I am forwarding this mail to mplayer-dev-eng list in the hopes that maybe someone would like to work on updating mplayer to the new ff* api. thanks to reimar for updating some api already and rtogni for posting a patch and also wm4 for suggesting checking patches from mplayer2 to avoid duplicating work. -compn On Wed, 5 Aug 2015 21:31:38 +0200 Andreas Cadhalpun <andreas.cadhalpun(a)googlemail.com> wrote: > On 04.08.2015 07:57, Reimar Döffinger wrote: > > I do have on more proposal, but the problem is it needs someone to > > do the work. For each removed feature, prepare documentation "a > > monkey could follow" on how to replace it (you could call it a > > transition guide). Even better, a script that automates it where > > reasonable. > > I think this is a very good idea. > > > In some cases it is just a matter of copy-pasting some existing > > wrapper code, particularly if we remove that wrapper code it is > > useful if people still have it available in the new release. > > If it's just a few hours of someone's time who even doesn't need to > > understand the code, I think we can very confidently say "not > > really our problem" if some applications still use it. > > Agreed. > > > If we that way find out that there are non-trivial cases or cases > > where the code gets a lot more complicated it might be a hint the > > new API is still crap and we maybe should come up with something > > better first. > > A more complete usage list for the deprecated APIs is: > > FF_API_PIX_FMT: 71 > amide avbin avifile bino blender chromium-browser dff dolphin-emu > dvbcut dvswitch ffdiaporama ffmpeg2theora ffmpegthumbnailer > ffmpegthumbs ffms2 fuse-emulator-utils gazebo gmerlin-avdecoder > gmerlin-encoders gnash gpac gst-libav1.0 guvcview harvid hedgewars > info-beamer jugglemaster karlyriceditor kino kodi lightspark lebiniou > libam7xxx libavg libde265 libextractor libquicktime linphone lives > lynkeos.app mlt mplayer mplayer2 mrpt opal opencv openmw > openscenegraph ovito paraview performous pjproject qutecom rbdoom3bfg > renpy shotdetect sflphone strigi survex transcode vcmi vlc vtk vtk6 > vxl wxsvg x264 xjadeo xpra yorick-av zoneminder > > FF_API_AVFRAME_LAVC: 53 > alsa-plugins amarok aubio avbin blender chromaprint dff dolphin-emu > dvbcut ffdiaporama ffmpegthumbnailer ffmpegthumbs fuse-emulator-utils > gazebo gmerlin-avdecoder gmerlin-encoders goldendict gpac > gst-libav1.0 hedgewars info-beamer jugglemaster kino libavg > libextractor libquicktime lightspark linphone mplayer mplayer2 mrpt > opal opencv openscenegraph ovito paraview performous pianopar qutecom > renpy shotdetect spek squeezelite transcode vcmi vlc vtk vtk6 vxl > xine-lib-1.2 xpra yorick-av zoneminder > > FF_API_GET_BUFFER: 9 > avifile dvswitch gmerlin-avdecoder gst-libav1.0 libavg mplayer > mplayer2 openmw openscenegraph > > FF_API_AUDIOCONVERT: 7 > alsa-plugins cantata ffdiaporama moc mplayer2 mpv vlc > > FF_API_SWS_CPU_CAPS: 6 > fuse-emulator-utils kodi mlt mplayer2 vlc zoneminder > > FF_API_DEINTERLACE: 5 > blender dff ffmpegthumbnailer ffmpegthumbs vxl > > FF_API_AVFRAME_LAVC(qscale): 3 > ffmpeg2theora kodi xine-lib-1.2 > > FF_API_CODEC_ID: 3 > chromium-browser dvswitch ffms2 > > FF_API_CONTEXT_SIZE: 3 > mplayer mplayer2 xine-lib-1.2 > > FF_API_REQUEST_CHANNELS: 3 > mplayer mplayer2 renpy > > FF_API_AV_REVERSE: 2 > mplayer mplayer2 > > FF_API_AVCODEC_RESAMPLE: 2 > mlt mplayer > > FF_API_DESTRUCT_PACKET: 2 > lives openmw > > FF_API_AVFILTERBUFFER: 2 > ffdiaporama pianobar > > FF_API_AVFILTERPAD_PUBLIC: 1 > mplayer > > FF_API_VIMA_DECODER: 1 > mplayer > > > > FF_API_PIX_FMT and FF_API_AVFRAME_LAVC are still widely used, but the > "patch-monkey" could deal with the changes and also with > FF_API_AUDIOCONVERT, FF_API_SWS_CPU_CAPS, FF_API_CODEC_ID, > FF_API_CONTEXT_SIZE, FF_API_REQUEST_CHANNELS and FF_API_VIMA_DECODER. > > Regarding FF_API_GET_BUFFER, get_buffer should be replaced with > get_buffer2, but it's not clear how release_buffer/reget_buffer > should be replaced. Can someone explain/document this? > > To get rid of FF_API_DEINTERLACE, one should 'use yadif (in > libavfilter) instead'. Well, ... how? > > Then, as part of FF_API_AVFRAME_LAVC(qscale), the fields > qscale_table, qstride and qscale_type of AVFrame are to be removed, > but (at least in FFmpeg) these are used by the not deprecated > functions av_frame_set_qp_table and av_frame_get_qp_table, so they > shouldn't be removed. Anyway it's not clear how to replace their > usage. > > Why is FF_API_AV_REVERSE deprecated? > It is used in FFmpeg's libavutil/eval.c. > > One should 'use libswresample instead' of FF_API_AVCODEC_RESAMPLE. > A more detailed explanation would be good. > > Same holds for FF_API_DESTRUCT_PACKET, where one should 'use the > AVBuffer API instead'. > > For FF_API_AVFILTERBUFFER no replacement is documented. > > FF_API_AVFILTERPAD_PUBLIC should be replaced by avfilter_pad_get_name > and avfilter_pad_get_type, but it seems that mplayer also uses others. > > Better documentation would surely be helpful. > > > Btw. the magic option to enable compatibility is still somewhat > > useful as it lists and allows testing the specific changes that are > > coming up. But I agree it's only a minor help. > > The problem with such a magic option is that it combines the > disadvantages of removing and not removing: Programs using the old > API get broken by default and the deprecated functionality remains in > the code base. > > Best regards, > Andreas

3 2

[PATCH]: Replace deprecated av_reverse with a local copy
by Andreas Cadhalpun 14 Aug '15

14 Aug '15

I think this is the last trivial API adaption, the others require more work. Best regards, Andreas

2 1

Replace deprecated avctx->request_channels
by Roberto Togni 14 Aug '15

14 Aug '15

The attached patch replaces the deprecated usage of avctx->request_channels, and replaces it with avctx->request_channel_layout, and also fills it with the default layout for the given number of channels. It should be equivalent for 1 and 2 channels; I have no idea if the defaults for more channels are the same as before. The old request_channels was used in ffmpeg only for ac3, aac, dca, and mpl. It works for me, but I can test it only with stereo speakers. Can anybody familiar with this code check if the behaviour is changed in some cases? Also if you have a multispeaker setup please test it. Ciao, Roberto

2 2

[PATCH 1/3] Enable broken audio CD image support in cue stream driver
by Ingo Brückl 14 Aug '15

14 Aug '15

The cue stream driver is basically capable of supporting audio images, too, but didn't do so far due to some bugs. On the one hand it reported an audio sector size of 0 bytes, on the other hand it worked with fixed video CD sector data sizes. By making these sector information variable, it now handles audio images with demuxer rawaudio as well. Ingo

3 6

[PATCH 3/3] Add stream control command aliases to the cue driver
by Ingo Brückl 13 Aug '15

13 Aug '15

STREAM_CTRL_GET_NUM_TITLES and STREAM_CTRL_GET_CURRENT_TITLE are for the sake of consistency. Ingo

1 0

[PATCH 2/3] Cosmetic: Remove all references to Video CDs from the identifiers
by Ingo Brückl 13 Aug '15

13 Aug '15

Now that the cue stream driver supports both audio and video images, don't reference to video CDs only, but name generically. Ingo

1 0

[PATCH] Enable playing Video CDs with libcdio
by Ingo Brückl 13 Aug '15

13 Aug '15

In times in which CDROM drives are becoming less and less common, it might be useful to be able to play bin/cue images instead of real disks (although one might doubt whether playing Video CDs is useful at all). For Audio CDs, it is already possible to play images utilizing libcdio, but it isn't for Video CDs, although libcdio is capable of doing it. Make the general VCD stream driver aware of libcdio and add the necessary libcdio specific routines. This is based on work from Rocky Bernstein, rocky panix com, posted 2004 on the development mailing list. Ingo

2 2

Re: [MPlayer-dev-eng] [FFmpeg-devel] New Server
by Michael Niedermayer 10 Aug '15

10 Aug '15

On Fri, Jul 24, 2015 at 07:06:02PM +0200, Michael Niedermayer wrote: > Hi all > > as you all probably know FFmpeg/Mplayer/... is searching for a > new free server & hosting ... > > We received the following offers for a new server and hosting. > If you think any of them are a bad choice then please speak now! > i ommited one non free offer and one unspecific offer from a company who > alternatively would want to finnancially sponsor us. > as well as at least one which would be technically insufficient > > If i forgot some offer or theres a mistake in the list below please > reply and add/correct the offer ASAP! > > I also intend to add a mention & link to the footer of the FFmpeg > webpage for whoever is choosen, several of the sponsors below did > not ask for that though. > If you object to that, again, please speak now. > > I intend to accept 2 of the offers below for redundancy, again if you > think something else should be done, speak now! I almost forgot replying. And i guess if i dont reply noone will feel authorative and reply anytime soon ... there are only 2 options noone had a argument against. OVH and vlc had arguments in public, hetzner (virus issue & 50euro/mo, also public) kierans box is too weak/old to host all our services but works fine for trac atm against nexcess / futurehosting.com i receved a private argument from a rtmpdump developer, as they are US based and hosting rtmpdump in the US is expected by them to be problematic. That leaves DreamHack and the Telepoint/MediaHub offer. I thus accept these 2 offers Thanks alot ! [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The greatest way to live with honor in this world is to be what we pretend to be. -- Socrates

3 4

[PATCH] sub: add -sub-extend-* options.
by Nicolas George 09 Aug '15

09 Aug '15

These options extend the duration of subtitles without causing overlapping. They can add a little comfort to people who are slow readers, although the effect is limited in fast dialog scenes since the room for extending is small. --- DOCS/man/en/mplayer.1 | 14 ++++++++++++++ cfg-common.h | 2 ++ mencoder.c | 2 ++ mpcommon.h | 2 ++ mplayer.c | 2 ++ sub/ass_mp.c | 26 ++++++++++++++++++++++++++ sub/subreader.c | 27 +++++++++++++++++++++++---- 7 files changed, 71 insertions(+), 4 deletions(-) diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 2b90878..cfba9d1 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -2869,6 +2869,20 @@ Delays subtitles by <sec> seconds. Can be negative. . .TP +.B \-sub\-extend\-after <sec> +Extend subtitles by delaying their disappearance by at most <sec> seconds. +It does not cause overlap if the next subtitle is less than <sec> away +and does not apply to already overlapping subtitles. +It does not work with subtitles embedded in the stream nor with bitmap +subtitles. +. +.TP +.B \-sub\-extend\-before <sec> +Extend subtitles by making them appear by at most <sec> seconds early. +See \-sub\-extend\-after for details. +If both options are specified, \-sub\-extend\-after has precedence. +. +.TP .B \-subfile <filename> (BETA CODE) Currently useless. Same as \-audiofile, but for subtitle streams (OggDS?). diff --git a/cfg-common.h b/cfg-common.h index 58748ff..e498a95 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -572,6 +572,8 @@ const m_option_t common_opts[] = { #endif {"subdelay", &sub_delay, CONF_TYPE_FLOAT, 0, 0.0, 10.0, NULL}, {"subfps", &sub_fps, CONF_TYPE_FLOAT, 0, 0.0, 10.0, NULL}, + {"sub-extend-after", &sub_extend_after, CONF_TYPE_FLOAT, 0, 0.0, 10.0, NULL}, + {"sub-extend-before", &sub_extend_before, CONF_TYPE_FLOAT, 0, 0.0, 10.0, NULL}, {"autosub", &sub_auto, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"noautosub", &sub_auto, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"unicode", &sub_unicode, CONF_TYPE_FLAG, 0, 0, 1, NULL}, diff --git a/mencoder.c b/mencoder.c index 1c34457..2548028 100644 --- a/mencoder.c +++ b/mencoder.c @@ -180,6 +180,8 @@ char **sub_name=NULL; char **sub_paths = NULL; float sub_delay=0; float sub_fps=0; +float sub_extend_after = 0; +float sub_extend_before = 0; int sub_auto = 0; char *vobsub_name = NULL; int subcc_enabled=0; diff --git a/mpcommon.h b/mpcommon.h index 8a7a334..38ee871 100644 --- a/mpcommon.h +++ b/mpcommon.h @@ -41,6 +41,8 @@ extern int forced_subs_only; extern int sub_auto; extern float sub_delay; extern float sub_fps; +extern float sub_extend_after; +extern float sub_extend_before; extern char **sub_name; extern char **sub_paths; extern char *font_name; diff --git a/mplayer.c b/mplayer.c index 527bc40..40d8bda 100644 --- a/mplayer.c +++ b/mplayer.c @@ -282,6 +282,8 @@ char **sub_name; char **sub_paths; float sub_delay; float sub_fps; +float sub_extend_after = 0; +float sub_extend_before = 0; int sub_auto = 1; char *vobsub_name; int subcc_enabled; diff --git a/sub/ass_mp.c b/sub/ass_mp.c index 60f464f..eed118b 100644 --- a/sub/ass_mp.c +++ b/sub/ass_mp.c @@ -212,6 +212,31 @@ ASS_Track* ass_read_subdata(ASS_Library* library, sub_data* subdata, double fps) return track; } +#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#define MAX(a, b) ((a) > (b) ? (a) : (b)) + +static void ass_extend_subs_time(ASS_Track *track) +{ + ASS_Event *ev = track->events; + long long ext_after = sub_extend_after * 1000; + long long ext_before = sub_extend_before * 1000; + long long start, end, bound; + int i; + + for (i = 0; i < track->n_events; i++) { + start = ev[i].Start; + end = start + ev[i].Duration; + bound = i < track->n_events + 1 ? ev[i + 1].Start : LLONG_MAX; + if (end < bound) + end = MIN(bound, end + ext_after); + bound = i > 0 ? ev[i - 1].Start + ev[i - 1].Duration : LLONG_MIN; + if (start > bound) + start = MAX(bound, start - ext_before); + ev[i].Start = start; + ev[i].Duration = end - start; + } +} + ASS_Track* ass_read_stream(ASS_Library* library, const char *fname, char *charset) { char *buf = NULL; ASS_Track *track; @@ -254,6 +279,7 @@ ASS_Track* ass_read_stream(ASS_Library* library, const char *fname, char *charse track->name = strdup(fname); } free(buf); + ass_extend_subs_time(track); return track; } diff --git a/sub/subreader.c b/sub/subreader.c index ecc5ff5..15afa87 100644 --- a/sub/subreader.c +++ b/sub/subreader.c @@ -1352,13 +1352,31 @@ static int sub_fribidi (subtitle *sub, int av_unused sub_utf8, int av_unused fro return 1; } -static void adjust_subs_time(subtitle* sub, float subtime, float fps, int block, +static void extend_subs_time(subtitle *sub, int nb_sub, double one_second) +{ + unsigned long ext_after = sub_extend_after * one_second; + unsigned long ext_before = sub_extend_before * one_second; + unsigned long bound; + int i; + + for (i = 0; i < nb_sub; i++) { + bound = i < nb_sub + 1 ? sub[i + 1].start : ULONG_MAX; + if (sub[i].end < bound) + sub[i].end = FFMIN(bound, sub[i].end + ext_after); + bound = i > 0 ? sub[i - 1].end : 0; + if (sub[i].start > bound) + sub[i].start = FFMAX(bound, FFMAX(sub[i].start, ext_before) - ext_before); + } +} + +static void adjust_subs_time(subtitle *firstsub, float subtime, float fps, int block, int sub_num, int sub_uses_time) { int n,m; - subtitle* nextsub; + subtitle *sub = firstsub, *nextsub; int i = sub_num; - unsigned long subfms = (sub_uses_time ? 100 : fps) * subtime; - unsigned long overlap = (sub_uses_time ? 100 : fps) / 5; // 0.2s + double one_second = sub_uses_time ? 100 : fps; + unsigned long subfms = one_second * subtime; + unsigned long overlap = one_second / 5; // 0.2s n=m=0; if (i) for (;;){ @@ -1409,6 +1427,7 @@ static void adjust_subs_time(subtitle* sub, float subtime, float fps, int block, m = 0; } if (n) mp_msg(MSGT_SUBREADER,MSGL_V,"SUB: Adjusted %d subtitle(s).\n", n); + extend_subs_time(firstsub, sub_num, one_second); } struct subreader { -- 2.5.0

1 0

[PATCH] etc/codecs.conf: Mark vdpau hevc acceleration as working
by Philip Langdale 06 Aug '15

06 Aug '15

This works correctly with the latest 355.06 nvidia drivers Signed-off-by: Philip Langdale <philipl(a)overt.org> --- etc/codecs.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/codecs.conf b/etc/codecs.conf index 8a50507..a5238e7 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -1400,7 +1400,7 @@ videocodec ffhevc videocodec ffhevcvdpau info "FFmpeg HEVC / H.265 (VDPAU)" - status buggy + status working fourcc HEVC fourcc hvc1 fourcc hev1 -- 2.1.4

1 0

[PATCH] Fix incomplete loading of playlists of certain sizes
by Joel Klinghed 02 Aug '15

02 Aug '15

Hi, the bug this patches fixes appears when you have playlist files of a size larger than the buffer size used by playtreeparser.c but smaller than the buffer size used by stream.c. What happens is that the whole playlist file is read by stream.c in and put in the stream buffer by stream_fill_buffer() and stream->eof is set to true. However, playtreeparser.c only fills it's own buffer and then upon seeing stream->eof being true, treats the playlist as ended even tho the stream buffer still contains data. My solution is not to use stream->eof at all but instead react to stream_read() returning == 0 as a marker for when the stream has ended Regards, Joel Klinghed

2 5

[PATCH 1/2] libvo/vo_png: Fix AVFrame creation.
by Michael Niedermayer 01 Aug '15

01 Aug '15

From: Michael Niedermayer <michael(a)niedermayer.cc> The previous code used uninitialized memory and could randomly crash Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libvo/vo_png.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libvo/vo_png.c b/libvo/vo_png.c index 06d4a88..109ff4f 100644 --- a/libvo/vo_png.c +++ b/libvo/vo_png.c @@ -147,7 +147,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin static uint32_t draw_image(mp_image_t* mpi){ - AVFrame pic; + AVFrame *pic; int buffersize; int res, got_pkt; char buf[100]; @@ -164,10 +164,11 @@ static uint32_t draw_image(mp_image_t* mpi){ return 1; } + pic = av_frame_alloc(); avctx->width = mpi->w; avctx->height = mpi->h; - pic.data[0] = mpi->planes[0]; - pic.linesize[0] = mpi->stride[0]; + pic->data[0] = mpi->planes[0]; + pic->linesize[0] = mpi->stride[0]; buffersize = mpi->w * mpi->h * 8; if (outbuffer_size < buffersize) { av_freep(&outbuffer); @@ -177,7 +178,8 @@ static uint32_t draw_image(mp_image_t* mpi){ av_init_packet(&pkt); pkt.data = outbuffer; pkt.size = outbuffer_size; - res = avcodec_encode_video2(avctx, &pkt, &pic, &got_pkt); + res = avcodec_encode_video2(avctx, &pkt, pic, &got_pkt); + av_frame_free(&pic); if (res < 0 || !got_pkt) { mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_PNG_ErrorInCreatePng); -- 1.7.9.5

3 4