[FFmpeg-devel] [PATCH 4/5] avcodec/hevc_sei: use ff_parse_a53_cc() to parse A53 Closed Captions

[James Almer]

On 8/10/2020 1:18 PM, Lynne wrote:
> Aug 10, 2020, 17:49 by jamrial at gmail.com:
> 
>> Signed-off-by: James Almer <jamrial at gmail.com>
>> ---
>>  configure             |  2 +-
>>  libavcodec/hevc_sei.c | 49 +++++++------------------------------------
>>  2 files changed, 9 insertions(+), 42 deletions(-)
>>
>> diff --git a/configure b/configure
>> index 5fd966035f..762e74a8ab 100755
>> --- a/configure
>> +++ b/configure
>> @@ -2743,7 +2743,7 @@ h264_decoder_suggest="error_resilience"
>>  hap_decoder_select="snappy texturedsp"
>>  hap_encoder_deps="libsnappy"
>>  hap_encoder_select="texturedspenc"
>> -hevc_decoder_select="bswapdsp cabac golomb hevcparse videodsp"
>> +hevc_decoder_select="atsc_a53 bswapdsp cabac golomb hevcparse videodsp"
>>  huffyuv_decoder_select="bswapdsp huffyuvdsp llviddsp"
>>  huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp llvidencdsp"
>>  hymt_decoder_select="huffyuv_decoder"
>> 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);
>>
> 
> Shouldn't all EINVALs be AVERROR_INVALIDDATA?

I thought about it, but decided to leave it as is seeing it was outside
the scope of this patch. I can change it in a separate patch.