aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-04-19 01:59:55 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-04-19 01:59:55 +0000
commit133ac890fbe48b2989a257eb58bfc0b3690ee054 (patch)
treeb61a61945cc719a15eda2e351c751c687a880079
parent454064ad1eb39ffbea4906dbe2e246e18a5d5d67 (diff)
downloadffmpeg-133ac890fbe48b2989a257eb58bfc0b3690ee054.tar.gz
Add new_frame_start and need_next_header.
based on a patch by Bartlomiej Originally committed as revision 12895 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/aac_ac3_parser.c3
-rw-r--r--libavcodec/aac_ac3_parser.h5
-rw-r--r--libavcodec/aac_parser.c5
-rw-r--r--libavcodec/ac3_parser.c5
4 files changed, 14 insertions, 4 deletions
diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c
index b3d4556734..8d7e20c516 100644
--- a/libavcodec/aac_ac3_parser.c
+++ b/libavcodec/aac_ac3_parser.c
@@ -31,6 +31,7 @@ int ff_aac_ac3_parse(AVCodecParserContext *s1,
AACAC3ParseContext *s = s1->priv_data;
ParseContext *pc = &s->pc;
int len, i;
+ int new_frame_start;
i=END_NOT_FOUND;
if(s->remaining_size <= buf_size){
@@ -41,7 +42,7 @@ int ff_aac_ac3_parse(AVCodecParserContext *s1,
len=0;
for(i=s->remaining_size; i<buf_size; i++){
s->state = (s->state<<8) + buf[i];
- if((len=s->sync(s->state, s)))
+ if((len=s->sync(s->state, s, &s->need_next_header, &new_frame_start)))
break;
}
if(len<=0){
diff --git a/libavcodec/aac_ac3_parser.h b/libavcodec/aac_ac3_parser.h
index cb84b8d7b0..37a94c8d50 100644
--- a/libavcodec/aac_ac3_parser.h
+++ b/libavcodec/aac_ac3_parser.h
@@ -29,7 +29,8 @@
typedef struct AACAC3ParseContext {
int frame_size;
int header_size;
- int (*sync)(uint64_t state, struct AACAC3ParseContext *hdr_info);
+ int (*sync)(uint64_t state, struct AACAC3ParseContext *hdr_info,
+ int *need_next_header, int *new_frame_start);
int channels;
int sample_rate;
@@ -39,6 +40,8 @@ typedef struct AACAC3ParseContext {
ParseContext pc;
int remaining_size;
uint64_t state;
+
+ int need_next_header;
} AACAC3ParseContext;
int ff_aac_ac3_parse(AVCodecParserContext *s1,
diff --git a/libavcodec/aac_parser.c b/libavcodec/aac_parser.c
index a2e95f7bb1..db2c697725 100644
--- a/libavcodec/aac_parser.c
+++ b/libavcodec/aac_parser.c
@@ -27,7 +27,8 @@
#define AAC_HEADER_SIZE 7
-static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info)
+static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info,
+ int *need_next_header, int *new_frame_start)
{
GetBitContext bits;
int size, rdb, ch, sr;
@@ -67,6 +68,8 @@ static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info)
hdr_info->samples = (rdb + 1) * 1024;
hdr_info->bit_rate = size * 8 * hdr_info->sample_rate / hdr_info->samples;
+ *need_next_header = 0;
+ *new_frame_start = 1;
return size;
}
diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c
index 511223398c..39cb77d868 100644
--- a/libavcodec/ac3_parser.c
+++ b/libavcodec/ac3_parser.c
@@ -123,7 +123,8 @@ int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr)
return 0;
}
-static int ac3_sync(uint64_t state, AACAC3ParseContext *hdr_info)
+static int ac3_sync(uint64_t state, AACAC3ParseContext *hdr_info,
+ int *need_next_header, int *new_frame_start)
{
int err;
uint64_t tmp = be2me_64(state);
@@ -139,6 +140,8 @@ static int ac3_sync(uint64_t state, AACAC3ParseContext *hdr_info)
hdr_info->channels = hdr.channels;
hdr_info->samples = AC3_FRAME_SIZE;
+ *need_next_header = 0;
+ *new_frame_start = 1;
return hdr.frame_size;
}