generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/j2kenc: store libavcodec ident in a comment unless bitexact mode is used

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-06-30 13:45:03 +02:00
parent e91f860ea7
commit 5c047f3ad4
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/j2kenc.c
View File

@ -317,6 +317,26 @@ static int put_qcd(Jpeg2000EncoderContext *s, int compno)
return 0; return 0;
} }
static int put_com(Jpeg2000EncoderContext *s, int compno)
{
int i;
int size = 4 + strlen(LIBAVCODEC_IDENT);
if (s->avctx->flags & CODEC_FLAG_BITEXACT)
return 0;
if (s->buf_end - s->buf < size + 2)
return -1;
bytestream_put_be16(&s->buf, JPEG2000_COM);
bytestream_put_be16(&s->buf, size);
bytestream_put_be16(&s->buf, 1); // General use (ISO/IEC 8859-15 (Latin) values)
bytestream_put_buffer(&s->buf, LIBAVCODEC_IDENT, strlen(LIBAVCODEC_IDENT));
return 0;
}
static uint8_t *put_sot(Jpeg2000EncoderContext *s, int tileno) static uint8_t *put_sot(Jpeg2000EncoderContext *s, int tileno)
{ {
uint8_t *psotptr; uint8_t *psotptr;
@ -1010,6 +1030,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
return ret; return ret;
if ((ret = put_qcd(s, 0)) < 0) if ((ret = put_qcd(s, 0)) < 0)
return ret; return ret;
if ((ret = put_com(s, 0)) < 0)
return ret;
for (tileno = 0; tileno < s->numXtiles * s->numYtiles; tileno++){ for (tileno = 0; tileno < s->numXtiles * s->numYtiles; tileno++){
uint8_t *psotptr; uint8_t *psotptr;