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

[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