videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

avcodec/avs2_parser: split data into frames 

Before the patch, the parser split data into units, not frames.

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
This commit is contained in:
Zhao Zhili 2022-06-13 11:36:33 +08:00 committed by Zhao Zhili
parent 592a9e57d9
commit b7eee211bc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/avs2.h
View File

@ -36,6 +36,6 @@ enum {
};
#define AVS2_ISPIC(x) ((x) == AVS2_INTRA_PIC_START_CODE || (x) == AVS2_INTER_PIC_START_CODE)
#define AVS2_ISUNIT(x) ((x) == AVS2_SEQ_START_CODE || (x) == AVS2_SEQ_END_CODE || (x) == AVS2_USER_DATA_START_CODE || AVS2_ISPIC(x))
#define AVS2_ISUNIT(x) ((x) == AVS2_SEQ_START_CODE || AVS2_ISPIC(x))
#endif

4
libavcodec/avs2_parser.c
View File

@ -31,7 +31,7 @@ static int avs2_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_siz
if (!pic_found) {
for (; cur < buf_size; ++cur) {
state = (state << 8) | buf[cur];
if (AVS2_ISUNIT(buf[cur])){
if ((state & 0xFFFFFF00) == 0x100 && AVS2_ISPIC(buf[cur])) {
cur++;
pic_found = 1;
break;
@ -44,7 +44,7 @@ static int avs2_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_siz
return END_NOT_FOUND;
for (; cur < buf_size; cur++) {
state = (state << 8) | buf[cur];
if ((state & 0xFFFFFF00) == 0x100 && state > AVS2_SLICE_MAX_START_CODE) {
if ((state & 0xFFFFFF00) == 0x100 && AVS2_ISUNIT(buf[cur])) {
pc->frame_start_found = 0;
pc->state = -1;
return cur - 3;