[FFmpeg-cvslog] Merge remote-tracking branch 'cehoyos/master'

2015-05-20 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Thu May 21 
01:26:30 2015 +0200| [737b0ca65b485a85ab1996241be05d08d1878682] | committer: 
Michael Niedermayer

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavc/qdrw: Do not fail decoding valid Quickdraw images.
  lavf/mov: Use AVCOL_SPC constants when checking color_space.
  lavf/mov: Write colour matrix "6" for color_space bt470bg.
  lavf/mkv: Only skip prores header if the packet is large enough.

Merged-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=737b0ca65b485a85ab1996241be05d08d1878682
---



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavc/qdrw: Do not fail decoding valid Quickdraw images.

2015-05-20 Thread Carl Eugen Hoyos 
ffmpeg | branch: master | Carl Eugen Hoyos  | Thu May 21 
01:05:13 2015 +0200| [209e91cbc4e1c4feaa3b7c2671b864b77874eff8] | committer: 
Carl Eugen Hoyos

lavc/qdrw: Do not fail decoding valid Quickdraw images.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=209e91cbc4e1c4feaa3b7c2671b864b77874eff8
---

 libavcodec/qdrw.c |1 -
 1 file changed, 1 deletion(-)

diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c
index 0bcf5dc..838f836 100644
--- a/libavcodec/qdrw.c
+++ b/libavcodec/qdrw.c
@@ -153,7 +153,6 @@ static int decode_frame(AVCodecContext *avctx,
 
 bytestream2_init(&gbc, avpkt->data, avpkt->size);
 if (   bytestream2_get_bytes_left(&gbc) >= 552
-   && !check_header(gbc.buffer  , bytestream2_get_bytes_left(&gbc))
&&  check_header(gbc.buffer + 512, bytestream2_get_bytes_left(&gbc) 
- 512)
)
 bytestream2_skip(&gbc, 512);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavf/mkv: Only skip prores header if the packet is large enough.

2015-05-20 Thread Carl Eugen Hoyos 
ffmpeg | branch: master | Carl Eugen Hoyos  | Thu May 21 
00:43:38 2015 +0200| [8f6b919d99687416deaedb2df6b8b5f49645a291] | committer: 
Carl Eugen Hoyos

lavf/mkv: Only skip prores header if the packet is large enough.

Fixes a possible endless loop.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8f6b919d99687416deaedb2df6b8b5f49645a291
---

 libavformat/matroskaenc.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 7cbba0b..c4c58f4 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1575,7 +1575,7 @@ static void mkv_write_block(AVFormatContext *s, 
AVIOContext *pb,
 } else
 data = pkt->data;
 
-if (codec->codec_id == AV_CODEC_ID_PRORES) {
+if (codec->codec_id == AV_CODEC_ID_PRORES && size >= 8) {
 /* Matroska specification requires to remove the first QuickTime atom
  */
 size  -= 8;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] ffmpeg_opt: add missing space in error message

2015-05-20 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Thu May 21 
01:47:50 2015 +0200| [0b9d636877a4ac5d5e4736ad34da083998ea60be] | committer: 
Michael Niedermayer

ffmpeg_opt: add missing space in error message

Found-by: rcombs
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0b9d636877a4ac5d5e4736ad34da083998ea60be
---

 ffmpeg_opt.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index aa0f3db..d70318c 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -2024,7 +2024,7 @@ loop_end:
map->file_index, map->stream_index);
 if (!ignore_unknown_streams) {
 av_log(NULL, AV_LOG_FATAL,
-   "If you want unsupported types ignored instead"
+   "If you want unsupported types ignored instead "
"of failing, please use the -ignore_unknown 
option\n");
 exit_program(1);
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavf/mov: Write colour matrix "6" for color_space bt470bg.

2015-05-20 Thread Carl Eugen Hoyos 
ffmpeg | branch: master | Carl Eugen Hoyos  | Thu May 21 
00:44:34 2015 +0200| [c4f864193f9753df3f721d5cebe39f32bd04ac11] | committer: 
Carl Eugen Hoyos

lavf/mov: Write colour matrix "6" for color_space bt470bg.

This matches the demuxer's behaviour.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c4f864193f9753df3f721d5cebe39f32bd04ac11
---

 libavformat/movenc.c |1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index b6821d4..4aa64b0 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1608,6 +1608,7 @@ static int mov_write_colr_tag(AVIOContext *pb, MOVTrack 
*track)
 }
 switch (track->enc->colorspace) {
 case AVCOL_TRC_BT709: avio_wb16(pb, 1); break;
+case AVCOL_SPC_BT470BG:
 case AVCOL_PRI_SMPTE170M: avio_wb16(pb, 6); break;
 case AVCOL_PRI_SMPTE240M: avio_wb16(pb, 7); break;
 default:  avio_wb16(pb, 2);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavf/mov: Use AVCOL_SPC constants when checking color_space.

2015-05-20 Thread Carl Eugen Hoyos 
ffmpeg | branch: master | Carl Eugen Hoyos  | Thu May 21 
01:04:57 2015 +0200| [4fb3efd2c17c419cb7a170e5438b35453ceaaf30] | committer: 
Carl Eugen Hoyos

lavf/mov: Use AVCOL_SPC constants when checking color_space.

Suggested-by: Ronald Bultje

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4fb3efd2c17c419cb7a170e5438b35453ceaaf30
---

 libavformat/movenc.c |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 4aa64b0..9cad1ae 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1607,10 +1607,10 @@ static int mov_write_colr_tag(AVIOContext *pb, MOVTrack 
*track)
 default:  avio_wb16(pb, 2);
 }
 switch (track->enc->colorspace) {
-case AVCOL_TRC_BT709: avio_wb16(pb, 1); break;
+case AVCOL_SPC_BT709: avio_wb16(pb, 1); break;
 case AVCOL_SPC_BT470BG:
-case AVCOL_PRI_SMPTE170M: avio_wb16(pb, 6); break;
-case AVCOL_PRI_SMPTE240M: avio_wb16(pb, 7); break;
+case AVCOL_SPC_SMPTE170M: avio_wb16(pb, 6); break;
+case AVCOL_SPC_SMPTE240M: avio_wb16(pb, 7); break;
 default:  avio_wb16(pb, 2);
 }
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] ffmpeg_opt: Give the user a hint on how to ignore unsupported streams

2015-05-20 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Thu May 21 
01:09:04 2015 +0200| [100df10b0f494060a07960f2306c6db414c28c8e] | committer: 
Michael Niedermayer

ffmpeg_opt: Give the user a hint on how to ignore unsupported streams

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=100df10b0f494060a07960f2306c6db414c28c8e
---

 ffmpeg_opt.c |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index e64c829..5abf7c3 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -2022,8 +2022,12 @@ loop_end:
 av_log(NULL, ignore_unknown_streams ? AV_LOG_FATAL : 
AV_LOG_WARNING,
"Cannot map stream #%d:%d - unsupported type.\n",
map->file_index, map->stream_index);
-if (!ignore_unknown_streams)
+if (!ignore_unknown_streams) {
+av_log(NULL, AV_LOG_FATAL,
+   "If you want unsupported types ignored instead"
+   "of failing, please use the -ignore_unknown 
option\n");
 exit_program(1);
+}
 }
 }
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] ffmpeg_opt: fix the error message log level for the unsupported stream types

2015-05-20 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Thu May 21 
01:09:49 2015 +0200| [592b053c7bacde6d13fe69bffd5b1b3b71fa1ca9] | committer: 
Michael Niedermayer

ffmpeg_opt: fix the error message log level for the unsupported stream types

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=592b053c7bacde6d13fe69bffd5b1b3b71fa1ca9
---

 ffmpeg_opt.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 5abf7c3..aa0f3db 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -2019,7 +2019,7 @@ loop_end:
 case AVMEDIA_TYPE_DATA:   ost = new_data_stream  (o, 
oc, src_idx); break;
 case AVMEDIA_TYPE_ATTACHMENT: ost = new_attachment_stream(o, 
oc, src_idx); break;
 default:
-av_log(NULL, ignore_unknown_streams ? AV_LOG_FATAL : 
AV_LOG_WARNING,
+av_log(NULL, ignore_unknown_streams ? AV_LOG_WARNING : 
AV_LOG_FATAL,
"Cannot map stream #%d:%d - unsupported type.\n",
map->file_index, map->stream_index);
 if (!ignore_unknown_streams) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] libvpx: add support for yuv440p and yuv440p10/12 encoding

2015-05-20 Thread James Almer 
ffmpeg | branch: master | James Almer  | Wed May 20 17:52:47 
2015 -0300| [40bf3687a1c12dc859ad9e76a53c79dd15d99ed6] | committer: James Almer

libvpx: add support for yuv440p and yuv440p10/12 encoding

Reviewed-by: James Zern 
Signed-off-by: James Almer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=40bf3687a1c12dc859ad9e76a53c79dd15d99ed6
---

 libavcodec/libvpx.c|4 
 libavcodec/libvpxenc.c |   24 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/libavcodec/libvpx.c b/libavcodec/libvpx.c
index b432fe9..e0f9df3 100644
--- a/libavcodec/libvpx.c
+++ b/libavcodec/libvpx.c
@@ -36,6 +36,7 @@ static const enum AVPixelFormat vp9_pix_fmts_def[] = {
 static const enum AVPixelFormat vp9_pix_fmts_highcol[] = {
 AV_PIX_FMT_YUV420P,
 AV_PIX_FMT_YUV422P,
+AV_PIX_FMT_YUV440P,
 AV_PIX_FMT_YUV444P,
 AV_PIX_FMT_NONE
 };
@@ -43,12 +44,15 @@ static const enum AVPixelFormat vp9_pix_fmts_highcol[] = {
 static const enum AVPixelFormat vp9_pix_fmts_highbd[] = {
 AV_PIX_FMT_YUV420P,
 AV_PIX_FMT_YUV422P,
+AV_PIX_FMT_YUV440P,
 AV_PIX_FMT_YUV444P,
 AV_PIX_FMT_YUV420P10LE,
 AV_PIX_FMT_YUV422P10LE,
+AV_PIX_FMT_YUV440P10LE,
 AV_PIX_FMT_YUV444P10LE,
 AV_PIX_FMT_YUV420P12LE,
 AV_PIX_FMT_YUV422P12LE,
+AV_PIX_FMT_YUV440P12LE,
 AV_PIX_FMT_YUV444P12LE,
 AV_PIX_FMT_NONE
 };
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index c2408a5..adf4b2e 100644
--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
@@ -280,9 +280,18 @@ static int set_pix_fmt(AVCodecContext *avctx, 
vpx_codec_caps_t codec_caps,
 *img_fmt = VPX_IMG_FMT_I420;
 return 0;
 case AV_PIX_FMT_YUV422P:
+enccfg->g_profile = 1;
+*img_fmt = VPX_IMG_FMT_I422;
+return 0;
+#if VPX_IMAGE_ABI_VERSION >= 3
+case AV_PIX_FMT_YUV440P:
+enccfg->g_profile = 1;
+*img_fmt = VPX_IMG_FMT_I440;
+return 0;
+#endif
 case AV_PIX_FMT_YUV444P:
 enccfg->g_profile = 1;
-*img_fmt = avctx->pix_fmt == AV_PIX_FMT_YUV422P ? VPX_IMG_FMT_I422 : 
VPX_IMG_FMT_I444;
+*img_fmt = VPX_IMG_FMT_I444;
 return 0;
 #ifdef VPX_IMG_FMT_HIGHBITDEPTH
 case AV_PIX_FMT_YUV420P10LE:
@@ -307,6 +316,19 @@ static int set_pix_fmt(AVCodecContext *avctx, 
vpx_codec_caps_t codec_caps,
 return 0;
 }
 break;
+#if VPX_IMAGE_ABI_VERSION >= 3
+case AV_PIX_FMT_YUV440P10LE:
+case AV_PIX_FMT_YUV440P12LE:
+if (codec_caps & VPX_CODEC_CAP_HIGHBITDEPTH) {
+enccfg->g_bit_depth = enccfg->g_input_bit_depth =
+avctx->pix_fmt == AV_PIX_FMT_YUV440P10LE ? 10 : 12;
+enccfg->g_profile = 3;
+*img_fmt = VPX_IMG_FMT_I44016;
+*flags |= VPX_CODEC_USE_HIGHBITDEPTH;
+return 0;
+}
+break;
+#endif
 case AV_PIX_FMT_YUV444P10LE:
 case AV_PIX_FMT_YUV444P12LE:
 if (codec_caps & VPX_CODEC_CAP_HIGHBITDEPTH) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] ffmpeg: support ignoring unsupported mapped streams

2015-05-20 Thread Rodger Combs 
ffmpeg | branch: master | Rodger Combs  | Wed May 20 
17:49:18 2015 -0500| [a2aff2690b578d6e449b5435e69e43f892499750] | committer: 
Michael Niedermayer

ffmpeg: support ignoring unsupported mapped streams

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a2aff2690b578d6e449b5435e69e43f892499750
---

 ffmpeg_opt.c |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index a8d433e..e64c829 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -111,6 +111,7 @@ static int do_psnr= 0;
 static int input_sync;
 static int override_ffserver  = 0;
 static int input_stream_potentially_available = 0;
+static int ignore_unknown_streams = 0;
 
 static void uninit_options(OptionsContext *o)
 {
@@ -2018,9 +2019,11 @@ loop_end:
 case AVMEDIA_TYPE_DATA:   ost = new_data_stream  (o, 
oc, src_idx); break;
 case AVMEDIA_TYPE_ATTACHMENT: ost = new_attachment_stream(o, 
oc, src_idx); break;
 default:
-av_log(NULL, AV_LOG_FATAL, "Cannot map stream #%d:%d - 
unsupported type.\n",
+av_log(NULL, ignore_unknown_streams ? AV_LOG_FATAL : 
AV_LOG_WARNING,
+   "Cannot map stream #%d:%d - unsupported type.\n",
map->file_index, map->stream_index);
-exit_program(1);
+if (!ignore_unknown_streams)
+exit_program(1);
 }
 }
 }
@@ -2855,6 +2858,8 @@ const OptionDef options[] = {
 "overwrite output files" },
 { "n",  OPT_BOOL,{ 
 &no_file_overwrite },
 "never overwrite output files" },
+{ "ignore_unknown", OPT_BOOL,{ 
 &ignore_unknown_streams },
+"Ignore unknown stream types" },
 { "c",  HAS_ARG | OPT_STRING | OPT_SPEC |
 OPT_INPUT | OPT_OUTPUT,  { .off
   = OFFSET(codec_names) },
 "codec name", "codec" },

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '3efe0393e4f0eaa27bac8833edbd7d3cff4704e1'

2015-05-20 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed May 20 
19:33:13 2015 +0200| [642355712b970c4b17a207cc0ea42ea6adaba39f] | committer: 
Michael Niedermayer

Merge commit '3efe0393e4f0eaa27bac8833edbd7d3cff4704e1'

* commit '3efe0393e4f0eaa27bac8833edbd7d3cff4704e1':
  hevc: make avcodec_decode_video2() fail if get_format() fails

Conflicts:
libavcodec/hevc.c

See: cc5e4bb48476a89cc8ce0c41bc2bd2e8fda9b37c
Merged-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=642355712b970c4b17a207cc0ea42ea6adaba39f
---



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] hevc: make avcodec_decode_video2() fail if get_format() fails

2015-05-20 Thread wm4 
ffmpeg | branch: master | wm4  | Thu May 14 19:23:57 
2015 +0200| [3efe0393e4f0eaa27bac8833edbd7d3cff4704e1] | committer: Vittorio 
Giovara

hevc: make avcodec_decode_video2() fail if get_format() fails

Personally, I need the decoder to back out if get_format() returns no
usable pixel format. This didn't work because the error code was not
propagated down the call chain. This in turn happened because the
variable declaration removed in this patch shadowed the variable, whose
value is returned at the end of the function. Consequently, failures of
decode_nal_unit() were ignored in this place.

Reviewed-by:  Andreas Cadhalpun 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3efe0393e4f0eaa27bac8833edbd7d3cff4704e1
---

 libavcodec/hevc.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 4c06fb8..1b5e2ed 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -2818,7 +2818,7 @@ static int decode_nal_units(HEVCContext *s, const uint8_t 
*buf, int length)
 
 /* parse the NAL units */
 for (i = 0; i < s->nb_nals; i++) {
-int ret = decode_nal_unit(s, &s->nals[i]);
+ret = decode_nal_unit(s, &s->nals[i]);
 if (ret < 0) {
 av_log(s->avctx, AV_LOG_WARNING,
"Error parsing NAL unit #%d.\n", i);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] nutdec: abort if EOF is reached in decode_info_header/read_sm_data

2015-05-20 Thread Andreas Cadhalpun 
ffmpeg | branch: master | Andreas Cadhalpun  
| Wed May 20 00:34:42 2015 +0200| [bb23a15df507440deb0dcf25099d321d0f73dc28] | 
committer: Andreas Cadhalpun

nutdec: abort if EOF is reached in decode_info_header/read_sm_data

These loops can take a lot of time if count is very large.

Reviewed-by: Michael Niedermayer 
Signed-off-by: Andreas Cadhalpun 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb23a15df507440deb0dcf25099d321d0f73dc28
---

 libavformat/nutdec.c |   16 
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 8994a91..f1cece8 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -492,7 +492,7 @@ static int decode_info_header(NUTContext *nut)
 AVIOContext *bc= s->pb;
 uint64_t tmp, chapter_start, chapter_len;
 unsigned int stream_id_plus1, count;
-int chapter_id, i;
+int chapter_id, i, ret;
 int64_t value, end;
 char name[256], str_value[1024], type_str[256];
 const char *type;
@@ -534,7 +534,11 @@ static int decode_info_header(NUTContext *nut)
 }
 
 for (i = 0; i < count; i++) {
-get_str(bc, name, sizeof(name));
+ret = get_str(bc, name, sizeof(name));
+if (ret < 0) {
+av_log(s, AV_LOG_ERROR, "get_str failed while decoding info 
header\n");
+return ret;
+}
 value = get_s(bc);
 str_value[0] = 0;
 
@@ -852,14 +856,18 @@ static int read_sm_data(AVFormatContext *s, AVIOContext 
*bc, AVPacket *pkt, int
 int sample_rate = 0;
 int width = 0;
 int height = 0;
-int i;
+int i, ret;
 
 for (i=0; i= maxpos)
 return AVERROR_INVALIDDATA;
-get_str(bc, name, sizeof(name));
+ret = get_str(bc, name, sizeof(name));
+if (ret < 0) {
+av_log(s, AV_LOG_ERROR, "get_str failed while reading sm data\n");
+return ret;
+}
 value = get_s(bc);
 
 if (value == -1) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/vmnc: Add back adapted comment about 24bit

2015-05-20 Thread Vittorio Giovara 
ffmpeg | branch: master | Vittorio Giovara  | Wed 
May 20 19:24:54 2015 +0200| [265d884eb076aca31a84596a41eb8b9db96db6b4] | 
committer: Michael Niedermayer

avcodec/vmnc: Add back adapted comment about 24bit

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=265d884eb076aca31a84596a41eb8b9db96db6b4
---

 libavcodec/vmnc.c |2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c
index f003368..58bd0e2 100644
--- a/libavcodec/vmnc.c
+++ b/libavcodec/vmnc.c
@@ -537,6 +537,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
 avctx->pix_fmt = AV_PIX_FMT_RGB555;
 break;
 case 24:
+/* 24 bits is not technically supported, but some clients might
+ * mistakenly set it, so let's assume they actually meant 32 bits */
 c->bpp = 32;
 case 32:
 avctx->pix_fmt = AV_PIX_FMT_0RGB32;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavfi: Move avcodec header to the only filter needing it

2015-05-20 Thread Vittorio Giovara 
ffmpeg | branch: master | Vittorio Giovara  | Thu 
May 14 23:37:25 2015 +0100| [7046bd9bc9ce04521edf453c9b603d84d69c7512] | 
committer: Vittorio Giovara

lavfi: Move avcodec header to the only filter needing it

af_ashowinfo, due to the enum AVAudioServiceType use.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7046bd9bc9ce04521edf453c9b603d84d69c7512
---

 libavfilter/af_ashowinfo.c |2 ++
 libavfilter/avfilter.h |1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c
index a91d7ac..5f0e254 100644
--- a/libavfilter/af_ashowinfo.c
+++ b/libavfilter/af_ashowinfo.c
@@ -36,6 +36,8 @@
 #include "libavutil/replaygain.h"
 #include "libavutil/samplefmt.h"
 
+#include "libavcodec/avcodec.h"
+
 #include "audio.h"
 #include "avfilter.h"
 #include "internal.h"
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 5c41630..57aa86d 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -40,7 +40,6 @@
 #include "libavutil/samplefmt.h"
 #include "libavutil/pixfmt.h"
 #include "libavutil/rational.h"
-#include "libavcodec/avcodec.h"
 
 #include 
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '7046bd9bc9ce04521edf453c9b603d84d69c7512'

2015-05-20 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed May 20 
19:03:51 2015 +0200| [6b783d2acea049d3ebbfe1352b55c8efe8b5168c] | committer: 
Michael Niedermayer

Merge commit '7046bd9bc9ce04521edf453c9b603d84d69c7512'

* commit '7046bd9bc9ce04521edf453c9b603d84d69c7512':
  lavfi: Move avcodec header to the only filter needing it

Conflicts:
libavfilter/avfilter.h

Merged-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6b783d2acea049d3ebbfe1352b55c8efe8b5168c
---



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] nutdec: stop skipping bytes at EOF

2015-05-20 Thread Andreas Cadhalpun 
ffmpeg | branch: master | Andreas Cadhalpun  
| Wed May 20 00:31:24 2015 +0200| [fa7dec8cb00d2d0dd96ff9863ccda38428610a21] | 
committer: Andreas Cadhalpun

nutdec: stop skipping bytes at EOF

This can unnecessarily waste a lot of time.

Reviewed-by: Michael Niedermayer 
Signed-off-by: Andreas Cadhalpun 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa7dec8cb00d2d0dd96ff9863ccda38428610a21
---

 libavformat/nutdec.c |   21 ++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 6742ee9..8994a91 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -47,6 +47,8 @@ static int get_str(AVIOContext *bc, char *string, unsigned 
int maxlen)
 while (len > maxlen) {
 avio_r8(bc);
 len--;
+if (bc->eof_reached)
+len = maxlen;
 }
 
 if (maxlen)
@@ -213,8 +215,11 @@ static int skip_reserved(AVIOContext *bc, int64_t pos)
 avio_seek(bc, pos, SEEK_CUR);
 return AVERROR_INVALIDDATA;
 } else {
-while (pos--)
+while (pos--) {
+if (bc->eof_reached)
+return AVERROR_INVALIDDATA;
 avio_r8(bc);
+}
 return 0;
 }
 }
@@ -293,8 +298,13 @@ static int decode_main_header(NUTContext *nut)
 if (tmp_fields > 7)
 tmp_head_idx = ffio_read_varlen(bc);
 
-while (tmp_fields-- > 8)
+while (tmp_fields-- > 8) {
+if (bc->eof_reached) {
+av_log(s, AV_LOG_ERROR, "reached EOF while decoding main 
header\n");
+return AVERROR_INVALIDDATA;
+}
 ffio_read_varlen(bc);
+}
 
 if (count <= 0 || count > 256 - (i <= 'N') - i) {
 av_log(s, AV_LOG_ERROR, "illegal count %d at %d\n", count, i);
@@ -992,8 +1002,13 @@ static int decode_frame_header(NUTContext *nut, int64_t 
*pts, int *stream_id,
 *header_idx = ffio_read_varlen(bc);
 if (flags & FLAG_RESERVED)
 reserved_count = ffio_read_varlen(bc);
-for (i = 0; i < reserved_count; i++)
+for (i = 0; i < reserved_count; i++) {
+if (bc->eof_reached) {
+av_log(s, AV_LOG_ERROR, "reached EOF while decoding frame 
header\n");
+return AVERROR_INVALIDDATA;
+}
 ffio_read_varlen(bc);
+}
 
 if (*header_idx >= (unsigned)nut->header_count) {
 av_log(s, AV_LOG_ERROR, "header_idx invalid\n");

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] nutdec: fix infinite resync loops

2015-05-20 Thread Andreas Cadhalpun 
ffmpeg | branch: master | Andreas Cadhalpun  
| Wed May 20 00:06:05 2015 +0200| [37e679881d364b6da817d829d35869d657218ab3] | 
committer: Andreas Cadhalpun

nutdec: fix infinite resync loops

nut->last_syncpoint_pos doesn't necessarily change between resync
attempts, so find_any_startcode can return the same startcode again.

Thus remember where the last resync happened and don't try to resync
before that.

This can't be done locally in nut_read_packet, because this wouldn't
prevent infinite resync loops, where after the resync a packet is
returned and while reading a following packet the resync happens again.

Reviewed-by: Michael Niedermayer 
Signed-off-by: Andreas Cadhalpun 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=37e679881d364b6da817d829d35869d657218ab3
---

 libavformat/nut.h|1 +
 libavformat/nutdec.c |5 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavformat/nut.h b/libavformat/nut.h
index 943081c..0c678a5 100644
--- a/libavformat/nut.h
+++ b/libavformat/nut.h
@@ -102,6 +102,7 @@ typedef struct NUTContext {
 unsigned int max_distance;
 unsigned int time_base_count;
 int64_t last_syncpoint_pos;
+int64_t last_resync_pos;
 int header_count;
 AVRational *time_base;
 struct AVTreeNode *syncpoints;
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index afe19ff..6742ee9 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -1126,7 +1126,8 @@ static int nut_read_packet(AVFormatContext *s, AVPacket 
*pkt)
 default:
 resync:
 av_log(s, AV_LOG_DEBUG, "syncing from %"PRId64"\n", pos);
-tmp = find_any_startcode(bc, nut->last_syncpoint_pos + 1);
+tmp = find_any_startcode(bc, FFMAX(nut->last_syncpoint_pos, 
nut->last_resync_pos) + 1);
+nut->last_resync_pos = avio_tell(bc);
 if (tmp == 0)
 return AVERROR_INVALIDDATA;
 av_log(s, AV_LOG_DEBUG, "sync\n");
@@ -1227,6 +1228,8 @@ static int read_seek(AVFormatContext *s, int stream_index,
 for (i = 0; i < s->nb_streams; i++)
 nut->stream[i].skip_until_key_frame = 1;
 
+nut->last_resync_pos = 0;
+
 return 0;
 }
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] vmnc: Delay pixel size check

2015-05-20 Thread Vittorio Giovara 
ffmpeg | branch: master | Vittorio Giovara  | Tue 
May 19 16:57:46 2015 +0100| [eafbc6716cede6d4a652f8bedf82f2901c68d06d] | 
committer: Vittorio Giovara

vmnc: Delay pixel size check

Some clients incorrectly set 24 as bits_per_coded_sample, while
the actual value is preserved in one of the codec headers.
In order to work around this, delay the check until decode_frame().

Signed-off-by: Vittorio Giovara 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eafbc6716cede6d4a652f8bedf82f2901c68d06d
---

 libavcodec/vmnc.c |   19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c
index 16984fb..23cfe25 100644
--- a/libavcodec/vmnc.c
+++ b/libavcodec/vmnc.c
@@ -419,10 +419,18 @@ static int decode_frame(AVCodecContext *avctx, void 
*data, int *got_frame,
 c->pic->pict_type = AV_PICTURE_TYPE_I;
 depth = bytestream2_get_byte(gb);
 if (depth != c->bpp) {
-av_log(avctx, AV_LOG_INFO,
-   "Depth mismatch. Container %i bpp, "
-   "Frame data: %i bpp\n",
-   c->bpp, depth);
+av_log(avctx, AV_LOG_WARNING, "Depth mismatch. "
+   "Container %i bpp / Codec %i bpp\n", c->bpp, depth);
+
+if (depth != 8 && depth != 16 && depth != 32) {
+av_log(avctx, AV_LOG_ERROR,
+   "Unsupported codec bitdepth %i\n", depth);
+return AVERROR_INVALIDDATA;
+}
+
+/* reset values */
+c->bpp  = depth;
+c->bpp2 = c->bpp / 8;
 }
 bytestream2_skip(gb, 1);
 c->bigendian = bytestream2_get_byte(gb);
@@ -524,6 +532,9 @@ static av_cold int decode_init(AVCodecContext *avctx)
 case 16:
 avctx->pix_fmt = AV_PIX_FMT_RGB555;
 break;
+case 24:
+/* 24 bits is not technically supported, but some clients might
+ * mistakenly set it -- delay the actual check until decode_frame() */
 case 32:
 avctx->pix_fmt = AV_PIX_FMT_RGB32;
 break;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit 'eafbc6716cede6d4a652f8bedf82f2901c68d06d'

2015-05-20 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed May 20 
18:31:55 2015 +0200| [a4c7aeaf82decc6a0d72b8d4447932363daa65a2] | committer: 
Michael Niedermayer

Merge commit 'eafbc6716cede6d4a652f8bedf82f2901c68d06d'

* commit 'eafbc6716cede6d4a652f8bedf82f2901c68d06d':
  vmnc: Delay pixel size check

Merged-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a4c7aeaf82decc6a0d72b8d4447932363daa65a2
---



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/vmnc: Simplify "24bit" support

2015-05-20 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed May 20 
18:50:38 2015 +0200| [b6ca7bfc7c12356e9e33eeab0ee8bf7ec865b944] | committer: 
Michael Niedermayer

avcodec/vmnc: Simplify "24bit" support

This also makes the code more robust, removing potential out of
array writes.

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b6ca7bfc7c12356e9e33eeab0ee8bf7ec865b944
---

 libavcodec/vmnc.c |   21 ++---
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c
index 4bdc2dd..f003368 100644
--- a/libavcodec/vmnc.c
+++ b/libavcodec/vmnc.c
@@ -432,18 +432,10 @@ static int decode_frame(AVCodecContext *avctx, void 
*data, int *got_frame,
 c->pic->pict_type = AV_PICTURE_TYPE_I;
 depth = bytestream2_get_byte(gb);
 if (depth != c->bpp) {
-av_log(avctx, AV_LOG_WARNING, "Depth mismatch. "
-   "Container %i bpp / Codec %i bpp\n", c->bpp, depth);
-
-if (depth != 8 && depth != 16 && depth != 32) {
-av_log(avctx, AV_LOG_ERROR,
-   "Unsupported codec bitdepth %i\n", depth);
-return AVERROR_INVALIDDATA;
-}
-
-/* reset values */
-c->bpp  = depth;
-c->bpp2 = c->bpp / 8;
+av_log(avctx, AV_LOG_INFO,
+   "Depth mismatch. Container %i bpp, "
+   "Frame data: %i bpp\n",
+   c->bpp, depth);
 }
 bytestream2_skip(gb, 1);
 c->bigendian = bytestream2_get_byte(gb);
@@ -536,7 +528,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
 c->width  = avctx->width;
 c->height = avctx->height;
 c->bpp= avctx->bits_per_coded_sample;
-c->bpp2   = c->bpp / 8;
 
 switch (c->bpp) {
 case 8:
@@ -546,8 +537,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
 avctx->pix_fmt = AV_PIX_FMT_RGB555;
 break;
 case 24:
-/* 24 bits is not technically supported, but some clients might
- * mistakenly set it -- delay the actual check until decode_frame() */
+c->bpp = 32;
 case 32:
 avctx->pix_fmt = AV_PIX_FMT_0RGB32;
 break;
@@ -555,6 +545,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
 av_log(avctx, AV_LOG_ERROR, "Unsupported bitdepth %i\n", c->bpp);
 return AVERROR_INVALIDDATA;
 }
+c->bpp2 = c->bpp / 8;
 
 c->pic = av_frame_alloc();
 if (!c->pic)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/hevc: Remove unused variable

2015-05-20 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed May 20 
18:15:22 2015 +0200| [6d1935d1b91c708619fe0b31eeed9c8d29378a4b] | committer: 
Michael Niedermayer

avcodec/hevc: Remove unused variable

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6d1935d1b91c708619fe0b31eeed9c8d29378a4b
---

 libavcodec/hevc.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index e55bc48..df6cce6 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -398,7 +398,7 @@ static int hls_slice_header(HEVCContext *s)
 {
 GetBitContext *gb = &s->HEVClc->gb;
 SliceHeader *sh   = &s->sh;
-int i, j, ret;
+int i, ret;
 
 // Coded parameters
 sh->first_slice_in_pic_flag = get_bits1(gb);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] configure: add cpuflags for loongson3 series cpu

2015-05-20 Thread 周晓勇 
ffmpeg | branch: master | 周晓勇  | Wed May 20 18:17:56 
2015 +0800| [f9d05786a82f25a18dbf8e2fe208e46405bb64c8] | committer: Michael 
Niedermayer

configure: add cpuflags for loongson3 series cpu

Signed-off-by: ZhouXiaoyong 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f9d05786a82f25a18dbf8e2fe208e46405bb64c8
---

 configure |1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index 7152afc..a02fe4a 100755
--- a/configure
+++ b/configure
@@ -3937,6 +3937,7 @@ elif enabled mips; then
 enable fast_cmov
 enable fast_unaligned
 disable aligned_stack
+cpuflags="-march=loongson3a -mhard-float"
 ;;
 generic)
 disable mips32r5

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avformat/nutdec: Fix recovery when immedeately after seeking a failure happens

2015-05-20 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed May 20 
17:32:48 2015 +0200| [b3496b4a33e806b7afdcbbf6f468b0332b676d7c] | committer: 
Michael Niedermayer

avformat/nutdec: Fix recovery when immedeately after seeking a failure happens

Found-by: Andreas Cadhalpun 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b3496b4a33e806b7afdcbbf6f468b0332b676d7c
---

 libavformat/nutdec.c |1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 15a6fe3..afe19ff 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -1220,6 +1220,7 @@ static int read_seek(AVFormatContext *s, int stream_index,
 av_log(NULL, AV_LOG_DEBUG, "SEEKTO: %"PRId64"\n", pos2);
 pos = find_startcode(s->pb, SYNCPOINT_STARTCODE, pos2);
 avio_seek(s->pb, pos, SEEK_SET);
+nut->last_syncpoint_pos = pos;
 av_log(NULL, AV_LOG_DEBUG, "SP: %"PRId64"\n", pos);
 if (pos2 > pos || pos2 + 15 < pos)
 av_log(NULL, AV_LOG_ERROR, "no syncpoint at backptr pos\n");

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avformat/nutdec: Return error on EOF from get_str()

2015-05-20 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed May 20 
17:13:15 2015 +0200| [6bbb2f8f4da67af374d62403742482cc5962aa21] | committer: 
Michael Niedermayer

avformat/nutdec: Return error on EOF from get_str()

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6bbb2f8f4da67af374d62403742482cc5962aa21
---

 libavformat/nutdec.c |2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 2762db2..15a6fe3 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -52,6 +52,8 @@ static int get_str(AVIOContext *bc, char *string, unsigned 
int maxlen)
 if (maxlen)
 string[FFMIN(len, maxlen - 1)] = 0;
 
+if (bc->eof_reached)
+return AVERROR_EOF;
 if (maxlen == len)
 return -1;
 else

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] fate: Add fate-mathops test

2015-05-20 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed May 20 
13:40:35 2015 +0200| [611e1085f8d21c0e7d1d6a975fa188c8f6898927] | committer: 
Michael Niedermayer

fate: Add fate-mathops test

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=611e1085f8d21c0e7d1d6a975fa188c8f6898927
---

 tests/fate/libavcodec.mak |6 ++
 1 file changed, 6 insertions(+)

diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak
index 044bcf8..ae8ef47 100644
--- a/tests/fate/libavcodec.mak
+++ b/tests/fate/libavcodec.mak
@@ -28,6 +28,12 @@ fate-rangecoder: CMD = run libavcodec/rangecoder-test
 fate-rangecoder: CMP = null
 fate-rangecoder: REF = /dev/null
 
+FATE_LIBAVCODEC-yes += fate-mathops
+fate-mathops: libavcodec/mathops-test$(EXESUF)
+fate-mathops: CMD = run libavcodec/mathops-test
+fate-mathops: CMP = null
+fate-mathops: REF = /dev/null
+
 FATE_LIBAVCODEC-$(call ENCDEC, FLAC, FLAC) += fate-api-flac
 fate-api-flac: libavcodec/api-flac-test$(EXESUF)
 fate-api-flac: CMD = run libavcodec/api-flac-test

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec: add mathops test

2015-05-20 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed May 20 
13:38:01 2015 +0200| [50965e067371a905dca04f5f867d5dd497d85871] | committer: 
Michael Niedermayer

avcodec: add mathops test

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=50965e067371a905dca04f5f867d5dd497d85871
---

 libavcodec/Makefile  |1 +
 libavcodec/mathops.c |   26 ++
 2 files changed, 27 insertions(+)

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index e1fd83b..cb88fd1 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -883,6 +883,7 @@ SKIPHEADERS-$(CONFIG_VDA)  += vda.h 
vda_internal.h
 SKIPHEADERS-$(CONFIG_VDPAU)+= vdpau.h vdpau_internal.h
 
 TESTPROGS = imgconvert  \
+mathops\
 options \
 avfft   \
 
diff --git a/libavcodec/mathops.c b/libavcodec/mathops.c
new file mode 100644
index 000..31c8e69
--- /dev/null
+++ b/libavcodec/mathops.c
@@ -0,0 +1,26 @@
+#include "mathops.h"
+
+#ifdef TEST
+
+#include 
+
+int main(void)
+{
+unsigned u;
+
+for(u=0; u<65536; u++) {
+unsigned s = u*u;
+unsigned root = ff_sqrt(s);
+unsigned root_m1 = ff_sqrt(s-1);
+if (s && root != u) {
+fprintf(stderr, "ff_sqrt failed at %u with %u\n", s, root);
+return 1;
+}
+if (u && root_m1 != u - 1) {
+fprintf(stderr, "ff_sqrt failed at %u with %u\n", s, root);
+return 1;
+}
+}
+return 0;
+}
+#endif /* TEST */

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavc/vmnc: Fix 32bit colour-space, there is no transparency.

2015-05-20 Thread Carl Eugen Hoyos 
ffmpeg | branch: master | Carl Eugen Hoyos  | Wed May 20 
14:59:38 2015 +0200| [eb0c08bc6938d1e873097a9c02772787d85b54b8] | committer: 
Carl Eugen Hoyos

lavc/vmnc: Fix 32bit colour-space, there is no transparency.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb0c08bc6938d1e873097a9c02772787d85b54b8
---

 libavcodec/vmnc.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c
index 46bd52e..aef3df3 100644
--- a/libavcodec/vmnc.c
+++ b/libavcodec/vmnc.c
@@ -538,7 +538,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
 avctx->pix_fmt = AV_PIX_FMT_RGB555;
 break;
 case 32:
-avctx->pix_fmt = AV_PIX_FMT_RGB32;
+avctx->pix_fmt = AV_PIX_FMT_0RGB32;
 break;
 default:
 av_log(avctx, AV_LOG_ERROR, "Unsupported bitdepth %i\n", c->bpp);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] configure: disable mipsfpu for loongson3

2015-05-20 Thread 周晓勇 
ffmpeg | branch: master | 周晓勇  | Wed May 20 18:15:49 
2015 +0800| [0d41f1ffbcaedcd9cbffd0625277b0de2360e9a5] | committer: Michael 
Niedermayer

configure: disable mipsfpu for loongson3

MIPSFPU optimization does't support FATE correctly on Loongson-3.

Signed-off-by: ZhouXiaoyong 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0d41f1ffbcaedcd9cbffd0625277b0de2360e9a5
---

 configure |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 2eada0e..7152afc 100755
--- a/configure
+++ b/configure
@@ -3923,7 +3923,7 @@ elif enabled mips; then
 check_ldflags "-mabi=64"
 ;;
 loongson3*)
-enable mipsfpu
+disable mipsfpu
 disable mips32r2
 disable mips32r5
 disable mips64r6

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] doc/encoders: add flac

2015-05-20 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed May 20 
02:31:03 2015 +0200| [886ba93009036988e7301010f1a5c55388bcdf84] | committer: 
Michael Niedermayer

doc/encoders: add flac

Reviewed-by: James Almer 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=886ba93009036988e7301010f1a5c55388bcdf84
---

 doc/encoders.texi |   79 +
 1 file changed, 79 insertions(+)

diff --git a/doc/encoders.texi b/doc/encoders.texi
index a6cdd99..753e683 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -494,6 +494,85 @@ Selected by Encoder (default)
 
 @end table
 
+@anchor{flac}
+@section flac
+
+FLAC (Free Lossless Audio Codec) Encoder
+
+@subsection Options
+
+The following options are supported by FFmpeg's flac encoder.
+
+@table @option
+@item compression_level
+Sets the compression level, which chooses defaults for many other options
+if they are not set explicitly.
+
+@item frame_size
+Sets the size of the frames in samples per channel.
+
+@item lpc_coeff_precision
+Sets the LPC coefficient precision, valid values are from 1 to 15, 15 is the
+default.
+
+@item lpc_type
+Sets the first stage LPC algorithm
+@table @samp
+@item none
+LPC is not used
+
+@item fixed
+fixed LPC coefficients
+
+@item levinson
+
+@item cholesky
+@end table
+
+@item lpc_passes
+Number of passes to use for Cholesky factorization during LPC analysis
+
+@item min_partition_order
+The minimum partition order
+
+@item max_partition_order
+The maximum partition order
+
+@item prediction_order_method
+@table @samp
+@item estimation
+@item 2level
+@item 4level
+@item 8level
+@item search
+Bruteforce search
+@item log
+@end table
+
+@item ch_mode
+Channel mode
+@table @samp
+@item auto
+The mode is chosen automatically for each frame
+@item indep
+Chanels are independently coded
+@item left_side
+@item right_side
+@item mid_side
+@end table
+
+@item exact_rice_parameters
+Chooses if rice parameters are calculated exactly or approximately.
+if set to 1 then they are chosen exactly, which slows the code down slightly 
and
+improves compression slightly.
+
+@item multi_dim_quant
+Multi Dimensional Quantization. If set to 1 then a 2nd stage LPC algorithm is
+applied after the first stage to finetune the coefficients. This is quite slow
+and slightly improves compression.
+
+@end table
+
 @anchor{libfaac}
 @section libfaac
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog