Unified · Split
| @@ -54,7 +54,8 @@ void ff_end_tag(AVIOContext *pb, int64_t start) · 53 unmodified lines | ||
| 54 | 54 | int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc) |
| 55 | 55 | { |
| 56 | 56 | int bps, blkalign, bytespersec, frame_size; |
| 57 | − int hdrsize = 18; | |
| 57 | + int hdrsize; | |
| 58 | + int64_t hdrstart = avio_tell(pb); | |
| 58 | 59 | int waveformatextensible; |
| 59 | 60 | uint8_t temp[256]; |
| 60 | 61 | uint8_t *riff_extradata = temp; |
| @@ -135,14 +136,12 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc) · 74 unmodified lines | ||
| 135 | 136 | avio_wl16(pb, blkalign); /* block align */ |
| 136 | 137 | avio_wl16(pb, bps); /* bits per sample */ |
| 137 | 138 | if (enc->codec_id == AV_CODEC_ID_MP3) { |
| 138 | − hdrsize += 12; | |
| 139 | 139 | bytestream_put_le16(&riff_extradata, 1); /* wID */ |
| 140 | 140 | bytestream_put_le32(&riff_extradata, 2); /* fdwFlags */ |
| 141 | 141 | bytestream_put_le16(&riff_extradata, 1152); /* nBlockSize */ |
| 142 | 142 | bytestream_put_le16(&riff_extradata, 1); /* nFramesPerBlock */ |
| 143 | 143 | bytestream_put_le16(&riff_extradata, 1393); /* nCodecDelay */ |
| 144 | 144 | } else if (enc->codec_id == AV_CODEC_ID_MP2) { |
| 145 | − hdrsize += 22; | |
| 146 | 145 | /* fwHeadLayer */ |
| 147 | 146 | bytestream_put_le16(&riff_extradata, 2); |
| 148 | 147 | /* dwHeadBitrate */ |
| @@ -160,23 +159,19 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc) · 11 unmodified lines | ||
| 160 | 159 | /* dwPTSHigh */ |
| 161 | 160 | bytestream_put_le32(&riff_extradata, 0); |
| 162 | 161 | } else if (enc->codec_id == AV_CODEC_ID_G723_1) { |
| 163 | − hdrsize += 20; | |
| 164 | 162 | bytestream_put_le32(&riff_extradata, 0x9ace0002); /* extradata needed for msacm g723.1 codec */ |
| 165 | 163 | bytestream_put_le32(&riff_extradata, 0xaea2f732); |
| 166 | 164 | bytestream_put_le16(&riff_extradata, 0xacde); |
| 167 | 165 | } else if (enc->codec_id == AV_CODEC_ID_GSM_MS || |
| 168 | 166 | enc->codec_id == AV_CODEC_ID_ADPCM_IMA_WAV) { |
| 169 | − hdrsize += 2; | |
| 170 | 167 | /* wSamplesPerBlock */ |
| 171 | 168 | bytestream_put_le16(&riff_extradata, frame_size); |
| 172 | 169 | } else if (enc->extradata_size) { |
| 173 | 170 | riff_extradata_start = enc->extradata; |
| 174 | 171 | riff_extradata = enc->extradata + enc->extradata_size; |
| 175 | − hdrsize += enc->extradata_size; | |
| 176 | 172 | } |
| 177 | 173 | /* write WAVEFORMATEXTENSIBLE extensions */ |
| 178 | 174 | if (waveformatextensible) { |
| 179 | − hdrsize += 22; | |
| 180 | 175 | /* 22 is WAVEFORMATEXTENSIBLE size */ |
| 181 | 176 | avio_wl16(pb, riff_extradata - riff_extradata_start + 22); |
| 182 | 177 | /* ValidBitsPerSample || SamplesPerBlock || Reserved */ |
| @@ -196,6 +191,7 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc) · 13 unmodified lines | ||
| 196 | 191 | avio_wl16(pb, riff_extradata - riff_extradata_start); /* cbSize */ |
| 197 | 192 | } |
| 198 | 193 | avio_write(pb, riff_extradata_start, riff_extradata - riff_extradata_start); |
| 194 | + hdrsize = avio_tell(pb) - hdrstart; | |
| 199 | 195 | if (hdrsize & 1) { |
| 200 | 196 | hdrsize++; |
| 201 | 197 | avio_w8(pb, 0); |