virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

wmavoice: reindent.

Browse Source
This commit is contained in:
Ronald S. Bultje 2016-12-20 17:14:41 -05:00
parent 3deb4b54a2
commit b011bb5f8b
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
libavcodec/wmavoice.c
View File

@ -1915,29 +1915,29 @@ static int wmavoice_decode_packet(AVCodecContext *ctx, void *data,
/* If the packet header specifies a s->spillover_nbits, then we want /* If the packet header specifies a s->spillover_nbits, then we want
* to push out all data of the previous packet (+ spillover) before * to push out all data of the previous packet (+ spillover) before
* continuing to parse new superframes in the current packet. */ * continuing to parse new superframes in the current packet. */
if (s->sframe_cache_size > 0) { if (s->sframe_cache_size > 0) {
int cnt = get_bits_count(gb); int cnt = get_bits_count(gb);
copy_bits(&s->pb, avpkt->data, size, gb, s->spillover_nbits); copy_bits(&s->pb, avpkt->data, size, gb, s->spillover_nbits);
flush_put_bits(&s->pb); flush_put_bits(&s->pb);
s->sframe_cache_size += s->spillover_nbits; s->sframe_cache_size += s->spillover_nbits;
if ((res = synth_superframe(ctx, data, got_frame_ptr)) == 0 && if ((res = synth_superframe(ctx, data, got_frame_ptr)) == 0 &&
*got_frame_ptr) { *got_frame_ptr) {
cnt += s->spillover_nbits; cnt += s->spillover_nbits;
s->skip_bits_next = cnt & 7; s->skip_bits_next = cnt & 7;
res = cnt >> 3; res = cnt >> 3;
if (res > avpkt->size) { if (res > avpkt->size) {
av_log(ctx, AV_LOG_ERROR, av_log(ctx, AV_LOG_ERROR,
"Trying to skip %d bytes in packet of size %d\n", "Trying to skip %d bytes in packet of size %d\n",
res, avpkt->size); res, avpkt->size);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
return res; return res;
} else } else
skip_bits_long (gb, s->spillover_nbits - cnt + skip_bits_long (gb, s->spillover_nbits - cnt +
get_bits_count(gb)); // resync get_bits_count(gb)); // resync
} else if (s->spillover_nbits) { } else if (s->spillover_nbits) {
skip_bits_long(gb, s->spillover_nbits); // resync skip_bits_long(gb, s->spillover_nbits); // resync
} }
} else if (s->skip_bits_next) } else if (s->skip_bits_next)
skip_bits(gb, s->skip_bits_next); skip_bits(gb, s->skip_bits_next);
@ -1949,20 +1949,20 @@ static int wmavoice_decode_packet(AVCodecContext *ctx, void *data,
*got_frame_ptr = 0; *got_frame_ptr = 0;
return size; return size;
} else if (s->nb_superframes > 0) { } else if (s->nb_superframes > 0) {
if ((res = synth_superframe(ctx, data, got_frame_ptr)) < 0) { if ((res = synth_superframe(ctx, data, got_frame_ptr)) < 0) {
return res; return res;
} else if (*got_frame_ptr) { } else if (*got_frame_ptr) {
int cnt = get_bits_count(gb); int cnt = get_bits_count(gb);
s->skip_bits_next = cnt & 7; s->skip_bits_next = cnt & 7;
res = cnt >> 3; res = cnt >> 3;
if (res > avpkt->size) { if (res > avpkt->size) {
av_log(ctx, AV_LOG_ERROR, av_log(ctx, AV_LOG_ERROR,
"Trying to skip %d bytes in packet of size %d\n", "Trying to skip %d bytes in packet of size %d\n",
res, avpkt->size); res, avpkt->size);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
}
return res;
} }
return res;
}
} else if ((s->sframe_cache_size = pos) > 0) { } else if ((s->sframe_cache_size = pos) > 0) {
/* ... cache it for spillover in next packet */ /* ... cache it for spillover in next packet */
init_put_bits(&s->pb, s->sframe_cache, SFRAME_CACHE_MAXSIZE); init_put_bits(&s->pb, s->sframe_cache, SFRAME_CACHE_MAXSIZE);