August 2016 - ffmpeg-cvslog - lists.ffmpeg.org

swscale: add support for P010LE/BE output
by git＠videolan.org 31 Aug '16

31 Aug '16

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Mon Aug 29 17:44:42 2016 +0200| [99882d05a6635446d587ed51b095c627abc42587] | committer: Timo Rothenpieler swscale: add support for P010LE/BE output > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99882d05a6635446d… --- libswscale/output.c | 98 +++++++++++++++++++++++++++++++++++- libswscale/utils.c | 4 +- libswscale/x86/swscale.c | 4 +- tests/ref/fate/filter-pixdesc-p010be | 1 + tests/ref/fate/filter-pixdesc-p010le | 1 + tests/ref/fate/filter-pixfmts-copy | 2 + tests/ref/fate/filter-pixfmts-crop | 2 + tests/ref/fate/filter-pixfmts-field | 2 + tests/ref/fate/filter-pixfmts-hflip | 2 + tests/ref/fate/filter-pixfmts-il | 2 + tests/ref/fate/filter-pixfmts-null | 2 + tests/ref/fate/filter-pixfmts-scale | 2 + tests/ref/fate/filter-pixfmts-vflip | 2 + 13 files changed, 119 insertions(+), 5 deletions(-) diff --git a/libswscale/output.c b/libswscale/output.c index f340c53..62cbe2f 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -311,6 +311,98 @@ static void yuv2nv12cX_c(SwsContext *c, const int16_t *chrFilter, int chrFilterS } } + +#define output_pixel(pos, val) \ + if (big_endian) { \ + AV_WB16(pos, av_clip_uintp2(val >> shift, 10) << 6); \ + } else { \ + AV_WL16(pos, av_clip_uintp2(val >> shift, 10) << 6); \ + } + +static void yuv2p010l1_c(const int16_t *src, + uint16_t *dest, int dstW, + int big_endian) +{ + int i; + int shift = 5; + + for (i = 0; i < dstW; i++) { + int val = src[i] + (1 << (shift - 1)); + output_pixel(&dest[i], val); + } +} + +static void yuv2p010lX_c(const int16_t *filter, int filterSize, + const int16_t **src, uint16_t *dest, int dstW, + int big_endian) +{ + int i, j; + int shift = 17; + + for (i = 0; i < dstW; i++) { + int val = 1 << (shift - 1); + + for (j = 0; j < filterSize; j++) + val += src[j][i] * filter[j]; + + output_pixel(&dest[i], val); + } +} + +static void yuv2p010cX_c(SwsContext *c, const int16_t *chrFilter, int chrFilterSize, + const int16_t **chrUSrc, const int16_t **chrVSrc, + uint8_t *dest8, int chrDstW) +{ + uint16_t *dest = (uint16_t*)dest8; + int shift = 17; + int big_endian = c->dstFormat == AV_PIX_FMT_P010BE; + int i, j; + + for (i = 0; i < chrDstW; i++) { + int u = 1 << (shift - 1); + int v = 1 << (shift - 1); + + for (j = 0; j < chrFilterSize; j++) { + u += chrUSrc[j][i] * chrFilter[j]; + v += chrVSrc[j][i] * chrFilter[j]; + } + + output_pixel(&dest[2*i] , u); + output_pixel(&dest[2*i+1], v); + } +} + +static void yuv2p010l1_LE_c(const int16_t *src, + uint8_t *dest, int dstW, + const uint8_t *dither, int offset) +{ + yuv2p010l1_c(src, (uint16_t*)dest, dstW, 0); +} + +static void yuv2p010l1_BE_c(const int16_t *src, + uint8_t *dest, int dstW, + const uint8_t *dither, int offset) +{ + yuv2p010l1_c(src, (uint16_t*)dest, dstW, 1); +} + +static void yuv2p010lX_LE_c(const int16_t *filter, int filterSize, + const int16_t **src, uint8_t *dest, int dstW, + const uint8_t *dither, int offset) +{ + yuv2p010lX_c(filter, filterSize, src, (uint16_t*)dest, dstW, 0); +} + +static void yuv2p010lX_BE_c(const int16_t *filter, int filterSize, + const int16_t **src, uint8_t *dest, int dstW, + const uint8_t *dither, int offset) +{ + yuv2p010lX_c(filter, filterSize, src, (uint16_t*)dest, dstW, 1); +} + +#undef output_pixel + + #define accumulate_bit(acc, val) \ acc <<= 1; \ acc |= (val) >= 234 @@ -2085,7 +2177,11 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, enum AVPixelFormat dstFormat = c->dstFormat; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(dstFormat); - if (is16BPS(dstFormat)) { + if (dstFormat == AV_PIX_FMT_P010LE || dstFormat == AV_PIX_FMT_P010BE) { + *yuv2plane1 = isBE(dstFormat) ? yuv2p010l1_BE_c : yuv2p010l1_LE_c; + *yuv2planeX = isBE(dstFormat) ? yuv2p010lX_BE_c : yuv2p010lX_LE_c; + *yuv2nv12cX = yuv2p010cX_c; + } else if (is16BPS(dstFormat)) { *yuv2planeX = isBE(dstFormat) ? yuv2planeX_16BE_c : yuv2planeX_16LE_c; *yuv2plane1 = isBE(dstFormat) ? yuv2plane1_16BE_c : yuv2plane1_16LE_c; } else if (is9_OR_10BPS(dstFormat)) { diff --git a/libswscale/utils.c b/libswscale/utils.c index 576d8f0..0aef672 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -246,8 +246,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_XYZ12BE] = { 1, 1, 1 }, [AV_PIX_FMT_XYZ12LE] = { 1, 1, 1 }, [AV_PIX_FMT_AYUV64LE] = { 1, 1}, - [AV_PIX_FMT_P010LE] = { 1, 0 }, - [AV_PIX_FMT_P010BE] = { 1, 0 }, + [AV_PIX_FMT_P010LE] = { 1, 1 }, + [AV_PIX_FMT_P010BE] = { 1, 1 }, }; int sws_isSupportedInput(enum AVPixelFormat pix_fmt) diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index d68e46b..869e7fb 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -429,14 +429,14 @@ av_cold void ff_sws_init_swscale_x86(SwsContext *c) #define ASSIGN_VSCALEX_FUNC(vscalefn, opt, do_16_case, condition_8bit) \ switch(c->dstBpc){ \ case 16: do_16_case; break; \ - case 10: if (!isBE(c->dstFormat)) vscalefn = ff_yuv2planeX_10_ ## opt; break; \ + case 10: if (!isBE(c->dstFormat) && c->dstFormat != AV_PIX_FMT_P010LE) vscalefn = ff_yuv2planeX_10_ ## opt; break; \ case 9: if (!isBE(c->dstFormat)) vscalefn = ff_yuv2planeX_9_ ## opt; break; \ case 8: if ((condition_8bit) && !c->use_mmx_vfilter) vscalefn = ff_yuv2planeX_8_ ## opt; break; \ } #define ASSIGN_VSCALE_FUNC(vscalefn, opt1, opt2, opt2chk) \ switch(c->dstBpc){ \ case 16: if (!isBE(c->dstFormat)) vscalefn = ff_yuv2plane1_16_ ## opt1; break; \ - case 10: if (!isBE(c->dstFormat) && opt2chk) vscalefn = ff_yuv2plane1_10_ ## opt2; break; \ + case 10: if (!isBE(c->dstFormat) && c->dstFormat != AV_PIX_FMT_P010LE && opt2chk) vscalefn = ff_yuv2plane1_10_ ## opt2; break; \ case 9: if (!isBE(c->dstFormat) && opt2chk) vscalefn = ff_yuv2plane1_9_ ## opt2; break; \ case 8: vscalefn = ff_yuv2plane1_8_ ## opt1; break; \ default: av_assert0(c->dstBpc>8); \ diff --git a/tests/ref/fate/filter-pixdesc-p010be b/tests/ref/fate/filter-pixdesc-p010be new file mode 100644 index 0000000..4d9dd22 --- /dev/null +++ b/tests/ref/fate/filter-pixdesc-p010be @@ -0,0 +1 @@ +pixdesc-p010be 784a49bf554861da9d0809a615bcf813 diff --git a/tests/ref/fate/filter-pixdesc-p010le b/tests/ref/fate/filter-pixdesc-p010le new file mode 100644 index 0000000..cac2635 --- /dev/null +++ b/tests/ref/fate/filter-pixdesc-p010le @@ -0,0 +1 @@ +pixdesc-p010le 0268fd44f63022e21ada69704534fc85 diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy index 5890d4d..ce957f7 100644 --- a/tests/ref/fate/filter-pixfmts-copy +++ b/tests/ref/fate/filter-pixfmts-copy @@ -35,6 +35,8 @@ monob 8b04f859fee6a0be856be184acd7a0b5 monow 54d16d2c01abfd72ecdb5e51e283937c nv12 8e24feb2c544dc26a20047a71e4c27aa nv21 335d85c9af6110f26ae9e187a82ed2cf +p010be 7f9842d6015026136bad60d03c035cc3 +p010le 1929db89609c4b8c6d9c9030a9e7843d pal8 ff5929f5b42075793b2c34cb441bede5 rgb0 0de71e5a1f97f81fb51397a0435bfa72 rgb24 f4438057d046e6d98ade4e45294b21be diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop index 9b0b36f..e2c77a8 100644 --- a/tests/ref/fate/filter-pixfmts-crop +++ b/tests/ref/fate/filter-pixfmts-crop @@ -33,6 +33,8 @@ gray16be 38f599da990224de86e3dc7a543121a9 gray16le 9ff7c866bd98def4e6c91542c1c45f80 nv12 92cda427f794374731ec0321ee00caac nv21 1bcfc197f4fb95de85ba58182d8d2f69 +p010be 8b2de2eb6b099bbf355bfc55a0694ddc +p010le a1e4f713e145dfc465bfe0cc77096a03 pal8 1f2cdc8e718f95c875dbc1034a688bfb rgb0 736646b70dd9a0be22b8da8041e35035 rgb24 c5fbbf816bb2000f4d2914e335698ef5 diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field index 135814a..20c76a1 100644 --- a/tests/ref/fate/filter-pixfmts-field +++ b/tests/ref/fate/filter-pixfmts-field @@ -35,6 +35,8 @@ monob 2129cc72a484d7e10a44de9117aa9f80 monow 03d783611d265cae78293f88ea126ea1 nv12 16f7a46708ef25ebd0b72e47920cc11e nv21 7294574037cc7f9373ef5695d8ebe809 +p010be a0311a09bba7383553267d2b3b9c075e +p010le f1cc90d292046109a626db2da9f0f9b6 pal8 0658c18dcd8d052d59dfbe23f5b368d9 rgb0 ca3fa6e865b91b3511c7f2bf62830059 rgb24 25ab271e26a5785be169578d99da5dd0 diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip index 561aa9f..8e902fb 100644 --- a/tests/ref/fate/filter-pixfmts-hflip +++ b/tests/ref/fate/filter-pixfmts-hflip @@ -33,6 +33,8 @@ gray16be cf7294d9aa23e1b838692ec01ade587b gray16le d91ce41e304419bcf32ac792f01bd64f nv12 801e58f1be5fd0b5bc4bf007c604b0b4 nv21 9f10dfff8963dc327d3395af21f0554f +p010be 744b13e44d39e1ff7588983fa03e0101 +p010le aeb31f50c66f376b0530c7bb6287212b pal8 5b7c77d99817b4f52339742a47de7797 rgb0 0092452f37d73da20193265ace0b7d57 rgb24 21571104e6091a689feabb7867e513dd diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il index 7795c9b..e568843 100644 --- a/tests/ref/fate/filter-pixfmts-il +++ b/tests/ref/fate/filter-pixfmts-il @@ -35,6 +35,8 @@ monob faba75df28033ba7ce3d82ff2a99ee68 monow 6e9cfb8d3a344c5f0c3e1d5e1297e580 nv12 3c3ba9b1b4c4dfff09c26f71b51dd146 nv21 ab586d8781246b5a32d8760a61db9797 +p010be 3df51286ef66b53e3e283dbbab582263 +p010le 38945445b360fa737e9e37257393e823 rgb0 cfaf68671e43248267d8cd50cae8c13f rgb24 88894f608cf33ba310f21996748d77a7 rgb444be 99d36d814988fb388aacdef575dacfcf diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null index 5890d4d..ce957f7 100644 --- a/tests/ref/fate/filter-pixfmts-null +++ b/tests/ref/fate/filter-pixfmts-null @@ -35,6 +35,8 @@ monob 8b04f859fee6a0be856be184acd7a0b5 monow 54d16d2c01abfd72ecdb5e51e283937c nv12 8e24feb2c544dc26a20047a71e4c27aa nv21 335d85c9af6110f26ae9e187a82ed2cf +p010be 7f9842d6015026136bad60d03c035cc3 +p010le 1929db89609c4b8c6d9c9030a9e7843d pal8 ff5929f5b42075793b2c34cb441bede5 rgb0 0de71e5a1f97f81fb51397a0435bfa72 rgb24 f4438057d046e6d98ade4e45294b21be diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index e082de8..62ea6fa 100644 --- a/tests/ref/fate/filter-pixfmts-scale +++ b/tests/ref/fate/filter-pixfmts-scale @@ -35,6 +35,8 @@ monob f01cb0b623357387827902d9d0963435 monow 35c68b86c226d6990b2dcb573a05ff6b nv12 b118d24a3653fe66e5d9e079033aef79 nv21 c74bb1c10dbbdee8a1f682b194486c4d +p010be 1d6726d94bf1385996a9a9840dd0e878 +p010le 5d436e6b35292a0e356d81f37f989b66 pal8 29e10892009b2cfe431815ec3052ed3b rgb0 fbd27e98154efb7535826afed41e9bb0 rgb24 e022e741451e81f2ecce1c7240b93e87 diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip index 94429b6..9651724 100644 --- a/tests/ref/fate/filter-pixfmts-vflip +++ b/tests/ref/fate/filter-pixfmts-vflip @@ -35,6 +35,8 @@ monob 7810c4857822ccfc844d78f5e803269a monow 90a947bfcd5f2261e83b577f48ec57b1 nv12 261ebe585ae2aa4e70d39a10c1679294 nv21 2909feacd27bebb080c8e0fa41795269 +p010be 06e9354b6e0e38ba41736352cedc0bd5 +p010le cdf6a3c38d9d4e3f079fa369e1dda662 pal8 450b0155d0f2d5628bf95a442db5f817 rgb0 56a7ea69541bcd27bef6a5615784722b rgb24 195e6dae1c3a488b9d3ceb7560d25d85

1 0

avfilter/drawutils: honor shift for color component description
by git＠videolan.org 31 Aug '16

31 Aug '16

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Wed Aug 31 11:25:25 2016 +0200| [2625b955a31a94d5f433ba75e933d1acf4259f13] | committer: Timo Rothenpieler avfilter/drawutils: honor shift for color component description > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2625b955a31a94d5f… --- libavfilter/drawutils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c index a3710db..f6760be 100644 --- a/libavfilter/drawutils.c +++ b/libavfilter/drawutils.c @@ -253,7 +253,8 @@ void ff_draw_color(FFDrawContext *draw, FFDrawColor *color, const uint8_t rgba[4 #define EXPAND(compn) \ if (desc->comp[compn].depth > 8) \ color->comp[desc->comp[compn].plane].u16[desc->comp[compn].offset] = \ - color->comp[desc->comp[compn].plane].u8[desc->comp[compn].offset] << (draw->desc->comp[compn].depth - 8) + color->comp[desc->comp[compn].plane].u8[desc->comp[compn].offset] << \ + (draw->desc->comp[compn].depth + draw->desc->comp[compn].shift - 8) EXPAND(3); EXPAND(2); EXPAND(1);

1 0

avfilter/drawutils: P010 is not supported
by git＠videolan.org 31 Aug '16

31 Aug '16

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Wed Aug 31 11:24:03 2016 +0200| [d3a23b67777a739d64080f03fc209b0ba1df7b2e] | committer: Timo Rothenpieler avfilter/drawutils: P010 is not supported > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d3a23b67777a739d6… --- libavfilter/drawutils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c index 8153fde..a3710db 100644 --- a/libavfilter/drawutils.c +++ b/libavfilter/drawutils.c @@ -184,6 +184,8 @@ int ff_draw_init(FFDrawContext *draw, enum AVPixelFormat format, unsigned flags) return AVERROR(EINVAL); if (desc->flags & ~(AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL | AV_PIX_FMT_FLAG_ALPHA)) return AVERROR(ENOSYS); + if (format == AV_PIX_FMT_P010LE || format == AV_PIX_FMT_P010BE) + return AVERROR(ENOSYS); for (i = 0; i < desc->nb_components; i++) { c = &desc->comp[i]; /* for now, only 8-16 bits formats */

1 0

avfilter/vf_lut: unbreak planar rgb suppot on big-endian
by git＠videolan.org 31 Aug '16

31 Aug '16

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Aug 31 11:18:40 2016 +0200| [8175fb03f0bad68ace3c074581ea44145bf9160a] | committer: Paul B Mahol avfilter/vf_lut: unbreak planar rgb suppot on big-endian > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8175fb03f0bad68ac… --- libavfilter/vf_lut.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c index 3e2f43c..312bb37 100644 --- a/libavfilter/vf_lut.c +++ b/libavfilter/vf_lut.c @@ -129,10 +129,10 @@ static av_cold void uninit(AVFilterContext *ctx) AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, \ AV_PIX_FMT_RGB48LE, AV_PIX_FMT_RGBA64LE, \ AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, \ - AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, \ - AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, \ - AV_PIX_FMT_GBRP16, AV_PIX_FMT_GBRAP12, \ - AV_PIX_FMT_GBRAP16 + AV_PIX_FMT_GBRP9LE, AV_PIX_FMT_GBRP10LE, \ + AV_PIX_FMT_GBRP12LE, AV_PIX_FMT_GBRP14LE, \ + AV_PIX_FMT_GBRP16LE, AV_PIX_FMT_GBRAP12LE, \ + AV_PIX_FMT_GBRAP16LE static const enum AVPixelFormat yuv_pix_fmts[] = { YUV_FORMATS, AV_PIX_FMT_NONE }; static const enum AVPixelFormat rgb_pix_fmts[] = { RGB_FORMATS, AV_PIX_FMT_NONE };

1 0

avformat/hlsenc: add warning for append_list and hls_init_time option
by git＠videolan.org 31 Aug '16

31 Aug '16

ffmpeg | branch: master | Steven Liu <lingjiujianke(a)gmail.com> | Tue Aug 30 17:26:54 2016 +0800| [3aab6fa6baf8f5511a9dec5996a303e25716f185] | committer: Michael Niedermayer avformat/hlsenc: add warning for append_list and hls_init_time option When use append_list mode, the hls_init_time set nouse, Because the append_list only support append at the old m3u8 end cannot set init segments durations at the middle of the list. That's invalid. and show a warning message for user. Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3aab6fa6baf8f5511… --- libavformat/hlsenc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index ab4a9bf..81b7efa 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -812,6 +812,12 @@ static int hls_write_header(AVFormatContext *s) if (hls->flags & HLS_APPEND_LIST) { parse_playlist(s, s->filename); + if (hls->init_time > 0) { + av_log(s, AV_LOG_WARNING, "append_list mode does not support hls_init_time," + " hls_init_time value will have no effect\n"); + hls->init_time = 0; + hls->recording_time = hls->time * AV_TIME_BASE; + } } if ((ret = hls_start(s)) < 0)

1 0

MAINTAINERS: Add myself for alsdec
by git＠videolan.org 31 Aug '16

31 Aug '16

ffmpeg | branch: master | Umair Khan <omerjerk(a)gmail.com> | Mon Aug 29 23:13:54 2016 +0530| [9fbf0660c170ff0757d2dfa2025d7287e79a8917] | committer: Michael Niedermayer MAINTAINERS: Add myself for alsdec Signed-off-by: Umair Khan <omerjerk(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9fbf0660c170ff075… --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 7f3ca36..62b818d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -136,7 +136,7 @@ Codecs: 8svx.c Jaikrishnan Menon aacenc*, aaccoder.c Rostislav Pehlivanov alacenc.c Jaikrishnan Menon - alsdec.c Thilo Borgmann + alsdec.c Thilo Borgmann, Umair Khan ass* Aurelien Jacobs asv* Michael Niedermayer atrac3plus* Maxim Poliakovski

1 0

avformat/crypto: add seeking support on read
by git＠videolan.org 30 Aug '16

30 Aug '16

ffmpeg | branch: master | Simon Hailes <btsimonh(a)googlemail.com> | Tue Aug 30 09:40:14 2016 +0100| [a13a81a0dc98a35293f3f2603db9b01bf76b6a05] | committer: Michael Niedermayer avformat/crypto: add seeking support on read cyrpto allows reading of data which has been aes-128-cbc encrypted given a key and an iv. But it did not handle filetypes which require seeking... e.g. it failed on an encrypted .mp4 file. example: take 25.mp4 created with: ffmpeg -f lavfi -i sine=frequency=1000:beep_factor=2:r=48000:duration=720.0 -f lavfi -i testsrc=duration=720.0:rate=25 -vcodec libx264 -cmp 22 -timecode 10:00:00:00 -r 25 -y out\25.mp4 encrypt with: openssl enc -aes-128-cbc -K 12345678901234567890123456789012 -iv 12345678901234567890123456789012 -in 25.mp4 -out 25.enc then to transcode in ffmpeg: ffmpeg -key 12345678901234567890123456789012 -iv 12345678901234567890123456789012 -i crypto:25.enc -vcodec mpeg4 -r 25 -y 25dec.mp4 prior to this modification, the transcode would fail. Note also: crypto previously maked both reads and writes as streamed, which caused the whole file to be read before the transcode started. Now, for read only, if the underlying layer is not marked as streamed, then crypto is not. This should enable efficient reading of encrypted containers which require seeking. Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a13a81a0dc98a3529… --- libavformat/crypto.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 114 insertions(+), 2 deletions(-) diff --git a/libavformat/crypto.c b/libavformat/crypto.c index 31a438c..346c706 100644 --- a/libavformat/crypto.c +++ b/libavformat/crypto.c @@ -37,6 +37,8 @@ typedef struct CryptoContext { outbuffer[BLOCKSIZE*MAX_BUFFER_BLOCKS]; uint8_t *outptr; int indata, indata_used, outdata; + int64_t position; // position in file - used in seek + int flags; int eof; uint8_t *key; int keylen; @@ -110,6 +112,7 @@ static int crypto_open2(URLContext *h, const char *uri, int flags, AVDictionary const char *nested_url; int ret = 0; CryptoContext *c = h->priv_data; + c->flags = flags; if (!av_strstart(uri, "crypto+", &nested_url) && !av_strstart(uri, "crypto:", &nested_url)) { @@ -118,6 +121,8 @@ static int crypto_open2(URLContext *h, const char *uri, int flags, AVDictionary goto err; } + c->position = 0; + if (flags & AVIO_FLAG_READ) { if ((ret = set_aes_arg(c, &c->decrypt_key, &c->decrypt_keylen, c->key, c->keylen, "decryption key")) < 0) @@ -153,6 +158,10 @@ static int crypto_open2(URLContext *h, const char *uri, int flags, AVDictionary ret = av_aes_init(c->aes_decrypt, c->decrypt_key, BLOCKSIZE*8, 1); if (ret < 0) goto err; + + // pass back information about the context we openned + if (c->hd->is_streamed) + h->is_streamed = c->hd->is_streamed; } if (flags & AVIO_FLAG_WRITE) { @@ -164,12 +173,13 @@ static int crypto_open2(URLContext *h, const char *uri, int flags, AVDictionary ret = av_aes_init(c->aes_encrypt, c->encrypt_key, BLOCKSIZE*8, 0); if (ret < 0) goto err; + // for write, we must be streamed + // - linear write only for crytpo aes-128-cbc + h->is_streamed = 1; } c->pad_len = 0; - h->is_streamed = 1; - err: return ret; } @@ -184,6 +194,7 @@ retry: memcpy(buf, c->outptr, size); c->outptr += size; c->outdata -= size; + c->position = c->position + size; return size; } // We avoid using the last block until we've found EOF, @@ -223,6 +234,106 @@ retry: goto retry; } +static int64_t crypto_seek(URLContext *h, int64_t pos, int whence) +{ + CryptoContext *c = h->priv_data; + int64_t block; + int64_t newpos; + + if (c->flags & AVIO_FLAG_WRITE) { + av_log(h, AV_LOG_ERROR, + "Crypto: seek not supported for write\r\n"); + /* seems the most appropriate error to return */ + return AVERROR(ESPIPE); + } + + // reset eof, else we won't read it correctly if we already hit eof. + c->eof = 0; + + switch (whence) { + case SEEK_SET: + break; + case SEEK_CUR: + pos = pos + c->position; + break; + case SEEK_END: { + int64_t newpos = ffurl_seek( c->hd, pos, AVSEEK_SIZE ); + if (newpos < 0) { + av_log(h, AV_LOG_ERROR, + "Crypto: seek_end - can't get file size (pos=%lld)\r\n", (long long int)pos); + return newpos; + } + pos = newpos - pos; + } + break; + case AVSEEK_SIZE: { + int64_t newpos = ffurl_seek( c->hd, pos, AVSEEK_SIZE ); + return newpos; + } + break; + default: + av_log(h, AV_LOG_ERROR, + "Crypto: no support for seek where 'whence' is %d\r\n", whence); + return AVERROR(EINVAL); + } + + c->outdata = 0; + c->indata = 0; + c->indata_used = 0; + c->outptr = c->outbuffer; + + // identify the block containing the IV for the + // next block we will decrypt + block = pos/BLOCKSIZE; + if (block == 0) { + // restore the iv to the seed one - this is the iv for the FIRST block + memcpy( c->decrypt_iv, c->iv, c->ivlen ); + c->position = 0; + } else { + // else, go back one block - we will get av_cyrpt to read this block + // which it will then store use as the iv. + // note that the DECRYPTED result will not be correct, + // but will be discarded + block--; + c->position = (block * BLOCKSIZE); + } + + newpos = ffurl_seek( c->hd, c->position, SEEK_SET ); + if (newpos < 0) { + av_log(h, AV_LOG_ERROR, + "Crypto: nested protocol no support for seek or seek failed\n"); + return newpos; + } + + // read and discard from here up to required position + // (which will set the iv correctly to it). + if (pos - c->position) { + uint8_t buff[BLOCKSIZE*2]; // maximum size of pos-c->position + int len = pos - c->position; + int res; + + while (len > 0) { + // note: this may not return all the bytes first time + res = crypto_read(h, buff, len); + if (res < 0) + break; + len -= res; + } + + // if we did not get all the bytes + if (len != 0) { + char errbuf[100] = "unknown error"; + av_strerror(res, errbuf, sizeof(errbuf)); + av_log(h, AV_LOG_ERROR, + "Crypto: discard read did not get all the bytes (%d remain) - read returned (%d)-%s\n", + len, res, errbuf); + return AVERROR(EINVAL); + } + } + + return c->position; +} + static int crypto_write(URLContext *h, const unsigned char *buf, int size) { CryptoContext *c = h->priv_data; @@ -288,6 +399,7 @@ static int crypto_close(URLContext *h) const URLProtocol ff_crypto_protocol = { .name = "crypto", .url_open2 = crypto_open2, + .url_seek = crypto_seek, .url_read = crypto_read, .url_write = crypto_write, .url_close = crypto_close,

1 0

libavformat/crypto - encourage reads of 4096 bytes
by git＠videolan.org 30 Aug '16

30 Aug '16

ffmpeg | branch: master | Simon Hailes <btsimonh(a)googlemail.com> | Tue Aug 30 08:47:02 2016 +0100| [a2fcacc880ca79b3f3636cf3e78d8c9164067224] | committer: Michael Niedermayer libavformat/crypto - encourage reads of 4096 bytes the current implementation reads in chunks of 149x16=2384 bytes. Seems more logical for it to read in chunks of 4096 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a2fcacc880ca79b3f… --- libavformat/crypto.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/crypto.c b/libavformat/crypto.c index 2999f50..31a438c 100644 --- a/libavformat/crypto.c +++ b/libavformat/crypto.c @@ -26,7 +26,8 @@ #include "internal.h" #include "url.h" -#define MAX_BUFFER_BLOCKS 150 +// encourage reads of 4096 bytes - 1 block is always retained. +#define MAX_BUFFER_BLOCKS 257 #define BLOCKSIZE 16 typedef struct CryptoContext {

1 0

cmdutils: fix implicit declaration of SetDllDirectory function
by git＠videolan.org 30 Aug '16

30 Aug '16

ffmpeg | branch: release/3.1 | Tobias Rapp <t.rapp(a)noa-archive.com> | Mon Aug 29 15:25:58 2016 +0200| [12320c08221f0eecf6d9af3a6f12f42e656f0674] | committer: James Almer cmdutils: fix implicit declaration of SetDllDirectory function Pre-processor check changed by commiter. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=12320c08221f0eecf… --- cmdutils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmdutils.c b/cmdutils.c index a725e77..3bb8bde 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -61,6 +61,9 @@ #include <sys/time.h> #include <sys/resource.h> #endif +#if HAVE_SETDLLDIRECTORY +#include <windows.h> +#endif static int init_report(const char *env);

1 0

cmdutils: fix implicit declaration of SetDllDirectory function
by git＠videolan.org 30 Aug '16

30 Aug '16

ffmpeg | branch: release/3.0 | Tobias Rapp <t.rapp(a)noa-archive.com> | Mon Aug 29 15:25:58 2016 +0200| [426b959e37bd1e27f369b887a4d2e3771a88033f] | committer: James Almer cmdutils: fix implicit declaration of SetDllDirectory function Pre-processor check changed by commiter. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=426b959e37bd1e27f… --- cmdutils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmdutils.c b/cmdutils.c index a725e77..3bb8bde 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -61,6 +61,9 @@ #include <sys/time.h> #include <sys/resource.h> #endif +#if HAVE_SETDLLDIRECTORY +#include <windows.h> +#endif static int init_report(const char *env);

1 0