highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavf: simplify ff_hevc_annexb2mp4_buf

Browse Source 
Use ff_hevc_annexb2mp4 instead of duplicating
its functionality, and update the documentation
to match the new behavior.

(cherry picked from commit 34bbc81de8a49fbddb92b76dc733f40890480b2b)
This commit is contained in:
Tim Walker 2014-03-10 15:03:13 +00:00 committed by Reinhard Tartler
parent 2c5e1d0933
commit 6d56bc9a6d
2 changed files with 5 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libavformat/hevc.c
View File

@ -1066,52 +1066,15 @@ int ff_hevc_annexb2mp4_buf(const uint8_t *buf_in, uint8_t **buf_out,
int *size, int filter_ps, int *ps_count) int *size, int filter_ps, int *ps_count)
{ {
AVIOContext *pb; AVIOContext *pb;
int num_ps = 0, ret = 0; int ret;
uint8_t *buf, *end, *start = NULL;
if (!filter_ps) {
ret = ff_avc_parse_nal_units_buf(buf_in, buf_out, size);
goto end;
}
ret = avio_open_dyn_buf(&pb); ret = avio_open_dyn_buf(&pb);
if (ret < 0) if (ret < 0)
goto end; return ret;
ret = ff_avc_parse_nal_units_buf(buf_in, &start, size);
if (ret < 0)
goto end;
buf = start;
end = start + *size;
while (end - buf > 4) {
uint32_t len = FFMIN(AV_RB32(buf), end - buf - 4);
uint8_t type = (buf[4] >> 1) & 0x3f;
buf += 4;
switch (type) {
case NAL_VPS:
case NAL_SPS:
case NAL_PPS:
num_ps++;
break;
default:
avio_wb32(pb, len);
avio_write(pb, buf, len);
break;
}
buf += len;
}
ret = ff_hevc_annexb2mp4(pb, buf_in, *size, filter_ps, ps_count);
*size = avio_close_dyn_buf(pb, buf_out); *size = avio_close_dyn_buf(pb, buf_out);
end:
free(start);
if (ps_count)
*ps_count = num_ps;
return ret; return ret;
} }

4
libavformat/hevc.h
View File

@ -71,8 +71,8 @@ int ff_hevc_annexb2mp4(AVIOContext *pb, const uint8_t *buf_in,
* or to discard them (non-zero) * or to discard them (non-zero)
* @param ps_count address of the variable where the number of discarded * @param ps_count address of the variable where the number of discarded
* parameter set NAL units shall be written, may be NULL * parameter set NAL units shall be written, may be NULL
* @return 0 in case of success, a negative value corresponding to an AVERROR * @return the amount (in bytes) of data written in case of success, a negative
* code in case of failure * value corresponding to an AVERROR code in case of failure
*/ */
int ff_hevc_annexb2mp4_buf(const uint8_t *buf_in, uint8_t **buf_out, int ff_hevc_annexb2mp4_buf(const uint8_t *buf_in, uint8_t **buf_out,
int *size, int filter_ps, int *ps_count); int *size, int filter_ps, int *ps_count);