[FFmpeg-cvslog] r12895 - in trunk/libavcodec: aac_ac3_parser.c aac_ac3_parser.h aac_parser.c ac3_parser.c
michael
subversion
Sat Apr 19 03:59:55 CEST 2008
Author: michael
Date: Sat Apr 19 03:59:55 2008
New Revision: 12895
Log:
Add new_frame_start and need_next_header.
based on a patch by Bartlomiej
Modified:
trunk/libavcodec/aac_ac3_parser.c
trunk/libavcodec/aac_ac3_parser.h
trunk/libavcodec/aac_parser.c
trunk/libavcodec/ac3_parser.c
Modified: trunk/libavcodec/aac_ac3_parser.c
==============================================================================
--- trunk/libavcodec/aac_ac3_parser.c (original)
+++ trunk/libavcodec/aac_ac3_parser.c Sat Apr 19 03:59:55 2008
@@ -31,6 +31,7 @@ int ff_aac_ac3_parse(AVCodecParserContex
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(AVCodecParserContex
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){
Modified: trunk/libavcodec/aac_ac3_parser.h
==============================================================================
--- trunk/libavcodec/aac_ac3_parser.h (original)
+++ trunk/libavcodec/aac_ac3_parser.h Sat Apr 19 03:59:55 2008
@@ -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,
Modified: trunk/libavcodec/aac_parser.c
==============================================================================
--- trunk/libavcodec/aac_parser.c (original)
+++ trunk/libavcodec/aac_parser.c Sat Apr 19 03:59:55 2008
@@ -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, AACA
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;
}
Modified: trunk/libavcodec/ac3_parser.c
==============================================================================
--- trunk/libavcodec/ac3_parser.c (original)
+++ trunk/libavcodec/ac3_parser.c Sat Apr 19 03:59:55 2008
@@ -123,7 +123,8 @@ int ff_ac3_parse_header(const uint8_t bu
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, AACA
hdr_info->channels = hdr.channels;
hdr_info->samples = AC3_FRAME_SIZE;
+ *need_next_header = 0;
+ *new_frame_start = 1;
return hdr.frame_size;
}
More information about the ffmpeg-cvslog
mailing list