August 2013 - ffmpeg-cvslog - lists.ffmpeg.org

Merge remote-tracking branch 'qatar/master'
by git＠videolan.org 31 Aug '13

31 Aug '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Aug 31 13:47:04 2013 +0200| [b043d80be4d8d1a5d16f3e864ebff3a4bbe9c509] | committer: Michael Niedermayer Merge remote-tracking branch 'qatar/master' * qatar/master: pcm_bluray: cosmetics Conflicts: libavcodec/pcm-bluray.c Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b043d80be4d8d1a5d… ---

1 0

pcm_bluray: cosmetics
by git＠videolan.org 31 Aug '13

31 Aug '13

ffmpeg | branch: master | Christian Schmidt <schmidt(a)digadd.de> | Fri Aug 30 18:15:46 2013 +0200| [21fd2f84ce21f8e03d0287a759cdcc5a5ea1d0a8] | committer: Luca Barbato pcm_bluray: cosmetics > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21fd2f84ce21f8e03… --- libavcodec/pcm-bluray.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libavcodec/pcm-bluray.c b/libavcodec/pcm-bluray.c index 9fbd9df..79b137d 100644 --- a/libavcodec/pcm-bluray.c +++ b/libavcodec/pcm-bluray.c @@ -46,7 +46,7 @@ */ /** - * Parse the header of a LPCM frame read from a MPEG-TS stream + * Parse the header of a LPCM frame read from a Blu-ray MPEG-TS stream * @param avctx the codec context * @param header pointer to the first four bytes of the data packet */ @@ -56,8 +56,9 @@ static int pcm_bluray_parse_header(AVCodecContext *avctx, static const uint8_t bits_per_samples[4] = { 0, 16, 20, 24 }; static const uint32_t channel_layouts[16] = { 0, AV_CH_LAYOUT_MONO, 0, AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_SURROUND, - AV_CH_LAYOUT_2_1, AV_CH_LAYOUT_4POINT0, AV_CH_LAYOUT_2_2, AV_CH_LAYOUT_5POINT0, - AV_CH_LAYOUT_5POINT1, AV_CH_LAYOUT_7POINT0, AV_CH_LAYOUT_7POINT1, 0, 0, 0, 0 + AV_CH_LAYOUT_2_1, AV_CH_LAYOUT_4POINT0, AV_CH_LAYOUT_2_2, + AV_CH_LAYOUT_5POINT0, AV_CH_LAYOUT_5POINT1, AV_CH_LAYOUT_7POINT0, + AV_CH_LAYOUT_7POINT1, 0, 0, 0, 0 }; static const uint8_t channels[16] = { 0, 1, 0, 2, 3, 3, 4, 4, 5, 6, 7, 8, 0, 0, 0, 0 @@ -74,8 +75,8 @@ static int pcm_bluray_parse_header(AVCodecContext *avctx, av_log(avctx, AV_LOG_ERROR, "reserved sample depth (0)\n"); return AVERROR_INVALIDDATA; } - avctx->sample_fmt = avctx->bits_per_coded_sample == 16 ? AV_SAMPLE_FMT_S16 : - AV_SAMPLE_FMT_S32; + avctx->sample_fmt = avctx->bits_per_coded_sample == 16 ? AV_SAMPLE_FMT_S16 + : AV_SAMPLE_FMT_S32; avctx->bits_per_raw_sample = avctx->bits_per_coded_sample; /* get the sample rate. Not all values are used. */ @@ -147,7 +148,8 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, void *data, /* There's always an even number of channels in the source */ num_source_channels = FFALIGN(avctx->channels, 2); - sample_size = (num_source_channels * (avctx->sample_fmt == AV_SAMPLE_FMT_S16 ? 16 : 24)) >> 3; + sample_size = (num_source_channels * + (avctx->sample_fmt == AV_SAMPLE_FMT_S16 ? 16 : 24)) >> 3; samples = buf_size / sample_size; /* get output buffer */

1 0

Merge commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f'
by git＠videolan.org 31 Aug '13

31 Aug '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Aug 31 13:35:52 2013 +0200| [4273236e2f6366e8a8ed7349cd6ac4c2f9e9863e] | committer: Michael Niedermayer Merge commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f' * commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f': pcm_bluray: rename pcm-mpeg.c to pcm-bluray.c Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4273236e2f6366e8a… ---

1 0

pcm_bluray: rename pcm-mpeg.c to pcm-bluray.c
by git＠videolan.org 31 Aug '13

31 Aug '13

ffmpeg | branch: master | Christian Schmidt <schmidt(a)digadd.de> | Fri Aug 30 18:15:44 2013 +0200| [0d6549d8b57aaa5be8efb794154cdbe9a645910f] | committer: Luca Barbato pcm_bluray: rename pcm-mpeg.c to pcm-bluray.c The original idea was to collect PCM codecs that could appear in various MPEG streams in this file. Discussion in IRC lead to the conclusion that one codec per file would be better and stop the need for #ifdefs. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0d6549d8b57aaa5be… --- libavcodec/Makefile | 2 +- libavcodec/{pcm-mpeg.c => pcm-bluray.c} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index abf0a38..2eba60f 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -426,7 +426,7 @@ OBJS-$(CONFIG_ZMBV_ENCODER) += zmbvenc.o # (AD)PCM decoders/encoders OBJS-$(CONFIG_PCM_ALAW_DECODER) += pcm.o OBJS-$(CONFIG_PCM_ALAW_ENCODER) += pcm.o -OBJS-$(CONFIG_PCM_BLURAY_DECODER) += pcm-mpeg.o +OBJS-$(CONFIG_PCM_BLURAY_DECODER) += pcm-bluray.o OBJS-$(CONFIG_PCM_DVD_DECODER) += pcm.o OBJS-$(CONFIG_PCM_F32BE_DECODER) += pcm.o OBJS-$(CONFIG_PCM_F32BE_ENCODER) += pcm.o diff --git a/libavcodec/pcm-mpeg.c b/libavcodec/pcm-bluray.c similarity index 99% rename from libavcodec/pcm-mpeg.c rename to libavcodec/pcm-bluray.c index 7b7afed..9fbd9df 100644 --- a/libavcodec/pcm-mpeg.c +++ b/libavcodec/pcm-bluray.c @@ -1,5 +1,5 @@ /* - * LPCM codecs for PCM formats found in MPEG streams + * LPCM codecs for PCM format found in Blu-ray PCM streams * Copyright (c) 2009, 2013 Christian Schmidt * * This file is part of Libav. @@ -21,7 +21,7 @@ /** * @file - * PCM codecs for encodings found in MPEG streams (DVD/Blu-ray) + * PCM codec for Blu-ray PCM audio tracks */ #include "libavutil/channel_layout.h"

1 0

avformat/avidec: match first index and first packet size=0 handling
by git＠videolan.org 31 Aug '13

31 Aug '13

ffmpeg | branch: release/2.0 | Michael Niedermayer <michaelni(a)gmx.at> | Sat Aug 31 03:08:25 2013 +0200| [1821c849da5be820c207eba11470d059473ea6df] | committer: Carl Eugen Hoyos avformat/avidec: match first index and first packet size=0 handling Fixes Ticket2861 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 227a0eb5a92409572f2cecde6137529b83e7d495) Conflicts: libavformat/avidec.c > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1821c849da5be820c… --- libavformat/avidec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index a09bebd..87a5e7c 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1328,7 +1328,7 @@ static int avi_read_idx1(AVFormatContext *s, int size) st = s->streams[index]; ast = st->priv_data; - if(first_packet && first_packet_pos && len) { + if (first_packet && first_packet_pos) { data_offset = first_packet_pos - pos; first_packet = 0; }

1 0

avformat/avidec: match first index and first packet size=0 handling
by git＠videolan.org 31 Aug '13

31 Aug '13

ffmpeg | branch: release/1.2 | Michael Niedermayer <michaelni(a)gmx.at> | Sat Aug 31 03:08:25 2013 +0200| [32cff0d3f096293189916ea438918bcca0445d50] | committer: Carl Eugen Hoyos avformat/avidec: match first index and first packet size=0 handling Fixes Ticket2861 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 227a0eb5a92409572f2cecde6137529b83e7d495) Conflicts: libavformat/avidec.c > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=32cff0d3f09629318… --- libavformat/avidec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 6513f3f..4852e44 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1303,7 +1303,7 @@ static int avi_read_idx1(AVFormatContext *s, int size) st = s->streams[index]; ast = st->priv_data; - if(first_packet && first_packet_pos && len) { + if (first_packet && first_packet_pos) { data_offset = first_packet_pos - pos; first_packet = 0; }

1 0

avformat/avidec: match first index and first packet size=0 handling
by git＠videolan.org 31 Aug '13

31 Aug '13

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni(a)gmx.at> | Sat Aug 31 03:08:25 2013 +0200| [f743c4ece8a857f475fe2e4188c26095fdd9a04d] | committer: Carl Eugen Hoyos avformat/avidec: match first index and first packet size=0 handling Fixes Ticket2861 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 227a0eb5a92409572f2cecde6137529b83e7d495) Conflicts: libavformat/avidec.c > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f743c4ece8a857f47… --- libavformat/avidec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 14fc2f7..248dd2c 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1301,7 +1301,7 @@ static int avi_read_idx1(AVFormatContext *s, int size) st = s->streams[index]; ast = st->priv_data; - if(first_packet && first_packet_pos && len) { + if (first_packet && first_packet_pos) { data_offset = first_packet_pos - pos; first_packet = 0; }

1 0

avformat/avidec: match first index and first packet size=0 handling
by git＠videolan.org 31 Aug '13

31 Aug '13

ffmpeg | branch: release/1.0 | Michael Niedermayer <michaelni(a)gmx.at> | Sat Aug 31 03:08:25 2013 +0200| [6b5c4be9e0b59b55f7c74466f0d6225623687c61] | committer: Carl Eugen Hoyos avformat/avidec: match first index and first packet size=0 handling Fixes Ticket2861 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 227a0eb5a92409572f2cecde6137529b83e7d495) Conflicts: libavformat/avidec.c > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6b5c4be9e0b59b55f… --- libavformat/avidec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index cf5f86f..ce621d6 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1288,7 +1288,7 @@ static int avi_read_idx1(AVFormatContext *s, int size) st = s->streams[index]; ast = st->priv_data; - if(first_packet && first_packet_pos && len) { + if (first_packet && first_packet_pos) { data_offset = first_packet_pos - pos; first_packet = 0; }

1 0

avformat/avidec: match first index and first packet size=0 handling
by git＠videolan.org 31 Aug '13

31 Aug '13

ffmpeg | branch: release/0.9 | Michael Niedermayer <michaelni(a)gmx.at> | Sat Aug 31 03:08:25 2013 +0200| [cf701b008fd3fa2d905463da68855b9ab8ba2777] | committer: Carl Eugen Hoyos avformat/avidec: match first index and first packet size=0 handling Fixes Ticket2861 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 227a0eb5a92409572f2cecde6137529b83e7d495) Conflicts: libavformat/avidec.c > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf701b008fd3fa2d9… --- libavformat/avidec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 6af070a..287fa4e 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1254,7 +1254,7 @@ static int avi_read_idx1(AVFormatContext *s, int size) st = s->streams[index]; ast = st->priv_data; - if(first_packet && first_packet_pos && len) { + if (first_packet && first_packet_pos) { data_offset = first_packet_pos - pos; first_packet = 0; }

1 0

avformat/avidec: match first index and first packet size=0 handling
by git＠videolan.org 31 Aug '13

31 Aug '13

ffmpeg | branch: release/0.11 | Michael Niedermayer <michaelni(a)gmx.at> | Sat Aug 31 03:08:25 2013 +0200| [d3ef17740d930ba114deffac93d2eef898f3e77f] | committer: Carl Eugen Hoyos avformat/avidec: match first index and first packet size=0 handling Fixes Ticket2861 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 227a0eb5a92409572f2cecde6137529b83e7d495) Conflicts: libavformat/avidec.c > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d3ef17740d930ba11… --- libavformat/avidec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 6120aa4..130defd 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1288,7 +1288,7 @@ static int avi_read_idx1(AVFormatContext *s, int size) st = s->streams[index]; ast = st->priv_data; - if(first_packet && first_packet_pos && len) { + if (first_packet && first_packet_pos) { data_offset = first_packet_pos - pos; first_packet = 0; }

1 0