virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/dca: return standard error codes in avpriv_dca_parse_core_frame_header()

Browse Source 
This prevents making the DCAParseError enum part of the ABI.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: foo86 <foobaz86@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-10-31 00:36:32 -03:00
parent 2b739e1cb8
commit 3df4939988
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/dca.c
View File

@ -149,9 +149,14 @@ int ff_dca_parse_core_frame_header(DCACoreFrameHeader *h, GetBitContext *gb)
int avpriv_dca_parse_core_frame_header(DCACoreFrameHeader *h, const uint8_t *buf, int size)
{
GetBitContext gb;
int ret;
if (init_get_bits8(&gb, buf, size) < 0)
return DCA_PARSE_ERROR_INVALIDDATA;
ret = init_get_bits8(&gb, buf, size);
if (ret < 0)
return ret;
return ff_dca_parse_core_frame_header(h, &gb);
if (ff_dca_parse_core_frame_header(h, &gb) < 0)
return AVERROR_INVALIDDATA;
return 0;
}

12
libavcodec/dca.h
View File

@ -46,7 +46,6 @@ enum DCAParseError {
DCA_PARSE_ERROR_RESERVED_BIT = -7,
DCA_PARSE_ERROR_LFE_FLAG = -8,
DCA_PARSE_ERROR_PCM_RES = -9,
DCA_PARSE_ERROR_INVALIDDATA = -10,
};
typedef struct DCACoreFrameHeader {
@ -211,10 +210,19 @@ int avpriv_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst,
/**
* Parse and validate core frame header
* @return 0 on success, negative DCA_PARSE_ERROR_ code on failure
* @param[out] h Pointer to struct where header info is written.
* @param[in] buf Pointer to the data buffer
* @param[in] size Size of the data buffer
* @return 0 on success, negative AVERROR code on failure
*/
int avpriv_dca_parse_core_frame_header(DCACoreFrameHeader *h, const uint8_t *buf, int size);
/**
* Parse and validate core frame header
* @param[out] h Pointer to struct where header info is written.
* @param[in] gbc BitContext containing the first 120 bits of the frame.
* @return 0 on success, negative DCA_PARSE_ERROR_ code on failure
*/
int ff_dca_parse_core_frame_header(DCACoreFrameHeader *h, GetBitContext *gb);
#endif /* AVCODEC_DCA_H */