summaryrefslogtreecommitdiff
path: root/libavcodec/hevc_sei.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2020-08-09 17:53:38 -0300
committerJames Almer <jamrial@gmail.com>2020-08-15 13:01:19 -0300
commit1ab3ae6fd5b1866aa42cfc0c5d79700adb7281d8 (patch)
tree12a16453f4733cfef65e88d2de69fb9b50a760e0 /libavcodec/hevc_sei.c
parentc93ba51ef3e2d83428360bd784166343145e7a3f (diff)
downloadffmpeg-1ab3ae6fd5b1866aa42cfc0c5d79700adb7281d8.tar.gz
avcodec/hevc_sei: use ff_parse_a53_cc() to parse A53 Closed Captions
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/hevc_sei.c')
-rw-r--r--libavcodec/hevc_sei.c49
1 files changed, 8 insertions, 41 deletions
diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c
index a4ec65dc1a..06e7a3a10c 100644
--- a/libavcodec/hevc_sei.c
+++ b/libavcodec/hevc_sei.c
@@ -22,6 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "atsc_a53.h"
#include "golomb.h"
#include "hevc_ps.h"
#include "hevc_sei.h"
@@ -164,51 +165,17 @@ static int decode_nal_sei_pic_timing(HEVCSEI *s, GetBitContext *gb, const HEVCPa
static int decode_registered_user_data_closed_caption(HEVCSEIA53Caption *s, GetBitContext *gb,
int size)
{
- int flag;
- int user_data_type_code;
- int cc_count;
+ int ret;
if (size < 3)
return AVERROR(EINVAL);
- user_data_type_code = get_bits(gb, 8);
- if (user_data_type_code == 0x3) {
- skip_bits(gb, 1); // reserved
-
- flag = get_bits(gb, 1); // process_cc_data_flag
- if (flag) {
- skip_bits(gb, 1);
- cc_count = get_bits(gb, 5);
- skip_bits(gb, 8); // reserved
- size -= 2;
-
- if (cc_count && size >= cc_count * 3) {
- int old_size = s->buf_ref ? s->buf_ref->size : 0;
- const uint64_t new_size = (old_size + cc_count
- * UINT64_C(3));
- int i, ret;
-
- if (new_size > INT_MAX)
- return AVERROR(EINVAL);
-
- /* Allow merging of the cc data from two fields. */
- ret = av_buffer_realloc(&s->buf_ref, new_size);
- if (ret < 0)
- return ret;
-
- for (i = 0; i < cc_count; i++) {
- s->buf_ref->data[old_size++] = get_bits(gb, 8);
- s->buf_ref->data[old_size++] = get_bits(gb, 8);
- s->buf_ref->data[old_size++] = get_bits(gb, 8);
- }
- skip_bits(gb, 8); // marker_bits
- }
- }
- } else {
- int i;
- for (i = 0; i < size - 1; i++)
- skip_bits(gb, 8);
- }
+ ret = ff_parse_a53_cc(&s->buf_ref, gb->buffer + get_bits_count(gb) / 8, size);
+
+ if (ret < 0)
+ return ret;
+
+ skip_bits_long(gb, size * 8);
return 0;
}