annotate adtsenc.c @ 1853:c704f9d730bf libavformat

Close connection on EOF this makes downloading some asx files from MS streaming servers work again (they would hang on eos). The http request header property connection:close is needed for _some_ 1.1 HTTP servers to close the connection at the end of file. patch by Ronald S. Bultje % rbultje A ronald P bitfreak P net% Original thread: Date: Mar 3, 2007 10:48 PM Subject: [Ffmpeg-devel] [PATCH] close connection on end-of-file
author gpoirier
date Sun, 04 Mar 2007 11:59:29 +0000
parents 0899bfe4105c
children dbcfc6a4c016
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
939
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
1 /*
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
2 * ADTS muxer.
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
3 * Copyright (c) 2006 Baptiste Coudurier <baptiste.coudurier@smartjog.com>
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
4 * Mans Rullgard <mru@inprovide.com>
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
5 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1169
diff changeset
6 * This file is part of FFmpeg.
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1169
diff changeset
7 *
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1169
diff changeset
8 * FFmpeg is free software; you can redistribute it and/or
939
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
9 * modify it under the terms of the GNU Lesser General Public
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
10 * License as published by the Free Software Foundation; either
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1169
diff changeset
11 * version 2.1 of the License, or (at your option) any later version.
939
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
12 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1169
diff changeset
13 * FFmpeg is distributed in the hope that it will be useful,
939
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
16 * Lesser General Public License for more details.
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
17 *
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
18 * You should have received a copy of the GNU Lesser General Public
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1169
diff changeset
19 * License along with FFmpeg; if not, write to the Free Software
939
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
21 */
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
22 #include "avformat.h"
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
23 #include "bitstream.h"
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
24
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
25 #define ADTS_HEADER_SIZE 7
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
26
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
27 typedef struct {
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
28 int write_adts;
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
29 int objecttype;
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
30 int sample_rate_index;
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
31 int channel_conf;
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
32 } ADTSContext;
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
33
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
34 static int decode_extradata(ADTSContext *adts, uint8_t *buf, int size)
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
35 {
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
36 GetBitContext gb;
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
37
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
38 init_get_bits(&gb, buf, size * 8);
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
39 adts->objecttype = get_bits(&gb, 5) - 1;
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
40 adts->sample_rate_index = get_bits(&gb, 4);
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
41 adts->channel_conf = get_bits(&gb, 4);
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
42
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
43 adts->write_adts = 1;
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
44
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
45 return 0;
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
46 }
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
47
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
48 static int adts_write_header(AVFormatContext *s)
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
49 {
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
50 ADTSContext *adts = s->priv_data;
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
51 AVCodecContext *avc = s->streams[0]->codec;
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
52
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
53 if(avc->extradata_size > 0)
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
54 decode_extradata(adts, avc->extradata, avc->extradata_size);
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
55
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
56 return 0;
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
57 }
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
58
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
59 static int adts_write_frame_header(AVFormatContext *s, int size)
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
60 {
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
61 ADTSContext *ctx = s->priv_data;
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
62 PutBitContext pb;
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
63 uint8_t buf[ADTS_HEADER_SIZE];
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
64
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
65 init_put_bits(&pb, buf, ADTS_HEADER_SIZE);
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
66
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
67 /* adts_fixed_header */
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
68 put_bits(&pb, 12, 0xfff); /* syncword */
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
69 put_bits(&pb, 1, 0); /* ID */
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
70 put_bits(&pb, 2, 0); /* layer */
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
71 put_bits(&pb, 1, 1); /* protection_absent */
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
72 put_bits(&pb, 2, ctx->objecttype); /* profile_objecttype */
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
73 put_bits(&pb, 4, ctx->sample_rate_index);
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
74 put_bits(&pb, 1, 0); /* private_bit */
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
75 put_bits(&pb, 3, ctx->channel_conf); /* channel_configuration */
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
76 put_bits(&pb, 1, 0); /* original_copy */
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
77 put_bits(&pb, 1, 0); /* home */
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
78
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
79 /* adts_variable_header */
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
80 put_bits(&pb, 1, 0); /* copyright_identification_bit */
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
81 put_bits(&pb, 1, 0); /* copyright_identification_start */
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
82 put_bits(&pb, 13, ADTS_HEADER_SIZE + size); /* aac_frame_length */
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
83 put_bits(&pb, 11, 0x7ff); /* adts_buffer_fullness */
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
84 put_bits(&pb, 2, 0); /* number_of_raw_data_blocks_in_frame */
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
85
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
86 flush_put_bits(&pb);
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
87 put_buffer(&s->pb, buf, ADTS_HEADER_SIZE);
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
88
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
89 return 0;
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
90 }
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
91
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
92 static int adts_write_trailer(AVFormatContext *s)
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
93 {
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
94 return 0;
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
95 }
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
96
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
97 static int adts_write_packet(AVFormatContext *s, AVPacket *pkt)
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
98 {
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
99 ADTSContext *adts = s->priv_data;
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
100 ByteIOContext *pb = &s->pb;
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
101
1043
09a392aa8b5a skip 0byte packets
bcoudurier
parents: 1041
diff changeset
102 if (!pkt->size)
09a392aa8b5a skip 0byte packets
bcoudurier
parents: 1041
diff changeset
103 return 0;
939
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
104 if(adts->write_adts)
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
105 adts_write_frame_header(s, pkt->size);
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
106 put_buffer(pb, pkt->data, pkt->size);
1041
ae2ea8f5a07f flush packets
bcoudurier
parents: 962
diff changeset
107 put_flush_packet(pb);
939
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
108
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
109 return 0;
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
110 }
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
111
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
112 AVOutputFormat adts_muxer = {
939
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
113 "adts",
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
114 "ADTS AAC",
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
115 "audio/aac",
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
116 "aac",
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
117 sizeof(ADTSContext),
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
118 CODEC_ID_AAC,
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
119 CODEC_ID_NONE,
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
120 adts_write_header,
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
121 adts_write_packet,
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
122 adts_write_trailer,
61959072be81 generate adts frame headers if required
mru
parents:
diff changeset
123 };