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