libeplayer3-arm: insert original blank lines from exteplayer3.git, for better merge

Origin commit data
------------------
Branch: master
Commit: b8d7e5ead4
Author: max_10 <max_10@gmx.de>
Date: 2018-04-10 (Tue, 10 Apr 2018)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

libeplayer3-arm/external/ffmpeg/src/bitstream.c

@@ -31,6 +31,7 @@
 #include <libavutil/avassert.h>
 #include <ffmpeg/put_bits.h>
 
+
 void avpriv_align_put_bits(PutBitContext *s)
 {
 	put_bits(s, s->bit_left & 7, 0);
@@ -52,9 +53,12 @@ void avpriv_copy_bits(PutBitContext *pb, const uint8_t *src, int length)
 	int words = length >> 4;
 	int bits  = length & 15;
 	int i;
+
 	if (length == 0)
 		return;
+
 	av_assert0(length <= put_bits_left(pb));
+
 	if (words < 16 || put_bits_count(pb) & 7)
 	{
 		for (i = 0; i < words; i++)
@@ -68,5 +72,7 @@ void avpriv_copy_bits(PutBitContext *pb, const uint8_t *src, int length)
 		memcpy(put_bits_ptr(pb), src + i, 2 * words - i);
 		skip_put_bytes(pb, 2 * words - i);
 	}
+
 	put_bits(pb, bits, AV_RB16(src + 2 * words) >> (16 - bits));
 }
+

libeplayer3-arm/external/ffmpeg/src/latmenc.c

@@ -38,9 +38,11 @@
 #define latmenc_err(fmt, x...)
 #endif
 
+
 int latmenc_decode_extradata(LATMContext *ctx, uint8_t *buf, int size)
 {
 	MPEG4AudioConfig m4ac;
+
 	if (size > MAX_EXTRADATA_SIZE)
 	{
 		latmenc_err("Extradata is larger than currently supported.\n");
@@ -49,6 +51,7 @@ int latmenc_decode_extradata(LATMContext *ctx, uint8_t *buf, int size)
 	ctx->off = avpriv_mpeg4audio_get_config(&m4ac, buf, size * 8, 1);
 	if (ctx->off < 0)
 		return ctx->off;
+
 	if (ctx->object_type == AOT_ALS && (ctx->off & 7))
 	{
 		// as long as avpriv_mpeg4audio_get_config works correctly this is impossible
@@ -56,6 +59,7 @@ int latmenc_decode_extradata(LATMContext *ctx, uint8_t *buf, int size)
 		return AVERROR_INVALIDDATA;
 	}
 	/* FIXME: are any formats not allowed in LATM? */
+
 	if (m4ac.object_type > AOT_SBR && m4ac.object_type != AOT_ALS)
 	{
 		latmenc_err("Muxing MPEG-4 AOT %d in LATM is not supported\n", m4ac.object_type);
@@ -63,14 +67,17 @@ int latmenc_decode_extradata(LATMContext *ctx, uint8_t *buf, int size)
 	}
 	ctx->channel_conf = m4ac.chan_config;
 	ctx->object_type  = m4ac.object_type;
+
 	return 0;
 }
 
 static void latmenc_write_frame_header(LATMContext *ctx, uint8_t *extradata, int extradata_size, PutBitContext *bs)
 {
 	int header_size;
+
 	/* AudioMuxElement */
 	put_bits(bs, 1, !!ctx->counter);
+
 	if (!ctx->counter)
 	{
 		/* StreamMuxConfig */
@@ -79,6 +86,7 @@ static void latmenc_write_frame_header(LATMContext *ctx, uint8_t *extradata, int
 		put_bits(bs, 6, 0); /* numSubFrames */
 		put_bits(bs, 4, 0); /* numProgram */
 		put_bits(bs, 3, 0); /* numLayer */
+
 		/* AudioSpecificConfig */
 		if (ctx->object_type == AOT_ALS)
 		{
@@ -90,6 +98,7 @@ static void latmenc_write_frame_header(LATMContext *ctx, uint8_t *extradata, int
 			// + 3 assumes not scalable and dependsOnCoreCoder == 0,
 			// see decode_ga_specific_config in libavcodec/aacdec.c
 			avpriv_copy_bits(bs, extradata, ctx->off + 3);
+
 			if (!ctx->channel_conf)
 			{
 				GetBitContext gb;
@@ -99,11 +108,14 @@ static void latmenc_write_frame_header(LATMContext *ctx, uint8_t *extradata, int
 				avpriv_copy_pce_data(bs, &gb);
 			}
 		}
+
 		put_bits(bs, 3, 0); /* frameLengthType */
 		put_bits(bs, 8, 0xff); /* latmBufferFullness */
+
 		put_bits(bs, 1, 0); /* otherDataPresent */
 		put_bits(bs, 1, 0); /* crcCheckPresent */
 	}
+
 	ctx->counter++;
 	ctx->counter %= ctx->mod;
 }
@@ -112,15 +124,22 @@ int latmenc_write_packet(LATMContext *ctx, uint8_t *data, int size, uint8_t *ext
 {
 	PutBitContext bs;
 	int i, len;
+
 	if (size > 0x1fff)
 		goto too_large;
+
 	init_put_bits(&bs, ctx->buffer, size + 1024 + MAX_EXTRADATA_SIZE);
+
 	latmenc_write_frame_header(ctx, extradata, extradata_size, &bs);
+
 	/* PayloadLengthInfo() */
 	for (i = 0; i <= size - 255; i += 255)
 		put_bits(&bs, 8, 255);
+
 	put_bits(&bs, 8, size - i);
+
 	/* The LATM payload is written unaligned */
+
 	/* PayloadMux() */
 	if (size && (data[0] & 0xe1) == 0x81)
 	{
@@ -137,17 +156,23 @@ int latmenc_write_packet(LATMContext *ctx, uint8_t *data, int size, uint8_t *ext
 	}
 	else
 		avpriv_copy_bits(&bs, data, 8 * size);
+
 	avpriv_align_put_bits(&bs);
 	flush_put_bits(&bs);
+
 	len = put_bits_count(&bs) >> 3;
+
 	if (len > 0x1fff)
 		goto too_large;
+
 	memcpy(ctx->loas_header, "\x56\xe0\x00", 3);
 	ctx->loas_header[1] |= (len >> 8) & 0x1f;
 	ctx->loas_header[2] |= len & 0xff;
 	ctx->len = len;
 	return 0;
+
 too_large:
 	latmenc_err("LATM packet size larger than maximum size 0x1fff\n");
 	return AVERROR_INVALIDDATA;
 }
+

libeplayer3-arm/external/ffmpeg/src/mpeg4audio.c

@@ -34,16 +34,21 @@ static int parse_config_ALS(GetBitContext *gb, MPEG4AudioConfig *c)
 {
 	if (get_bits_left(gb) < 112)
 		return -1;
+
 	if (get_bits_long(gb, 32) != MKBETAG('A', 'L', 'S', '\0'))
 		return -1;
+
 	// override AudioSpecificConfig channel configuration and sample rate
 	// which are buggy in old ALS conformance files
 	c->sample_rate = get_bits_long(gb, 32);
+
 	// skip number of samples
 	skip_bits_long(gb, 32);
+
 	// read number of channels
 	c->chan_config = 0;
 	c->channels    = get_bits(gb, 16) + 1;
+
 	return 0;
 }
 
@@ -79,11 +84,14 @@ int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf,
 {
 	GetBitContext gb;
 	int specific_config_bitindex, ret;
+
 	if (bit_size <= 0)
 		return AVERROR_INVALIDDATA;
+
 	ret = init_get_bits(&gb, buf, bit_size);
 	if (ret < 0)
 		return ret;
+
 	c->object_type = get_object_type(&gb);
 	c->sample_rate = get_sample_rate(&gb, &c->sampling_index);
 	c->chan_config = get_bits(&gb, 4);
@@ -110,15 +118,19 @@ int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf,
 		c->ext_sample_rate = 0;
 	}
 	specific_config_bitindex = get_bits_count(&gb);
+
 	if (c->object_type == AOT_ALS)
 	{
 		skip_bits(&gb, 5);
 		if (show_bits_long(&gb, 24) != MKBETAG('\0', 'A', 'L', 'S'))
 			skip_bits_long(&gb, 24);
+
 		specific_config_bitindex = get_bits_count(&gb);
+
 		if (parse_config_ALS(&gb, c))
 			return -1;
 	}
+
 	if (c->ext_object_type != AOT_SBR && sync_extension)
 	{
 		while (get_bits_left(&gb) > 15)
@@ -141,12 +153,14 @@ int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf,
 				get_bits1(&gb); // skip 1 bit
 		}
 	}
+
 	//PS requires SBR
 	if (!c->sbr)
 		c->ps = 0;
 	//Limit implicit PS to the HE-AACv2 Profile
 	if ((c->ps == -1 && c->object_type != AOT_AAC_LC) || c->channels & ~0x01)
 		c->ps = 0;
+
 	return specific_config_bitindex;
 }
 
@@ -163,6 +177,7 @@ int avpriv_copy_pce_data(PutBitContext *pb, GetBitContext *gb)
 {
 	int five_bit_ch, four_bit_ch, comment_size, bits;
 	int offset = put_bits_count(pb);
+
 	copy_bits(pb, gb, 10);                  //Tag, Object Type, Frequency
 	five_bit_ch  = copy_bits(pb, gb, 4);    //Front
 	five_bit_ch += copy_bits(pb, gb, 4);    //Side
@@ -185,5 +200,6 @@ int avpriv_copy_pce_data(PutBitContext *pb, GetBitContext *gb)
 	comment_size = copy_bits(pb, gb, 8);
 	for (; comment_size > 0; comment_size--)
 		copy_bits(pb, gb, 8);
+
 	return put_bits_count(pb) - offset;
 }