RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-11 06:58:18 +00:00
Code Issues Projects Releases Wiki Activity

rtpdec_jpeg: Simplify writing of the jpeg header

Browse Source 
Generalize writing of any number of qtables. Don't manually write
16 bit values in two separate calls.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2012-09-11 12:32:37 +03:00
parent 932d8300d3
commit 43957fcc71
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavformat/rtpdec_jpeg.c
View File

@ -101,7 +101,7 @@ static int jpeg_create_header(uint8_t *buf, int size, uint32_t type, uint32_t w,
{ {
PutBitContext pbc; PutBitContext pbc;
uint8_t *dht_size_ptr; uint8_t *dht_size_ptr;
int dht_size; int dht_size, i;
init_put_bits(&pbc, buf, size); init_put_bits(&pbc, buf, size);
@ -125,21 +125,15 @@ static int jpeg_create_header(uint8_t *buf, int size, uint32_t type, uint32_t w,
/* DQT */ /* DQT */
put_marker(&pbc, DQT); put_marker(&pbc, DQT);
if (nb_qtable == 2) { put_bits(&pbc, 16, 2 + nb_qtable * (1 + 64));
put_bits(&pbc, 16, 2 + 2 * (1 + 64));
} else { for (i = 0; i < nb_qtable; i++) {
put_bits(&pbc, 16, 2 + 1 * (1 + 64)); put_bits(&pbc, 8, i);
}
put_bits(&pbc, 8, 0);
/* Each table is an array of 64 values given in zig-zag /* Each table is an array of 64 values given in zig-zag
* order, identical to the format used in a JFIF DQT * order, identical to the format used in a JFIF DQT
* marker segment. */ * marker segment. */
avpriv_copy_bits(&pbc, qtable, 64 * 8); avpriv_copy_bits(&pbc, qtable + 64 * i, 64 * 8);
if (nb_qtable == 2) {
put_bits(&pbc, 8, 1);
avpriv_copy_bits(&pbc, qtable + 64, 64 * 8);
} }
/* DHT */ /* DHT */
@ -163,10 +157,8 @@ static int jpeg_create_header(uint8_t *buf, int size, uint32_t type, uint32_t w,
put_marker(&pbc, SOF0); put_marker(&pbc, SOF0);
put_bits(&pbc, 16, 17); put_bits(&pbc, 16, 17);
put_bits(&pbc, 8, 8); put_bits(&pbc, 8, 8);
put_bits(&pbc, 8, h >> 8); put_bits(&pbc, 16, h);
put_bits(&pbc, 8, h); put_bits(&pbc, 16, w);
put_bits(&pbc, 8, w >> 8);
put_bits(&pbc, 8, w);
put_bits(&pbc, 8, 3); put_bits(&pbc, 8, 3);
put_bits(&pbc, 8, 1); put_bits(&pbc, 8, 1);
put_bits(&pbc, 8, type ? 34 : 33); put_bits(&pbc, 8, type ? 34 : 33);