annotate libmpdemux/muxer_lavf.c @ 36659:f41b65ac7e81

configure: disable internal libmpeg2 by default. While the last tests showed that it can be slightly faster in some cases, the difference should not be relevant to the majority of users. In addition, the code is of not particularly high quality, so I consider it better/safer to have it disabled by default. Removing the code after the next release is a possible future action.
author reimar
date Sun, 26 Jan 2014 18:19:31 +0000
parents 13e767d419fc
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
29238
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27656
diff changeset
1 /*
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27656
diff changeset
2 * This file is part of MPlayer.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27656
diff changeset
3 *
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27656
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27656
diff changeset
5 * it under the terms of the GNU General Public License as published by
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27656
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27656
diff changeset
7 * (at your option) any later version.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27656
diff changeset
8 *
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27656
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27656
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27656
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27656
diff changeset
12 * GNU General Public License for more details.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27656
diff changeset
13 *
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27656
diff changeset
14 * You should have received a copy of the GNU General Public License along
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27656
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27656
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27656
diff changeset
17 */
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27656
diff changeset
18
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
19 #include <stdio.h>
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
20 #include <stdlib.h>
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
21 #include <string.h>
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
22 #include <sys/types.h>
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
23 #include <inttypes.h>
17485
8d25d5b720de limits.h for INT_MAX
michael
parents: 17484
diff changeset
24 #include <limits.h>
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
25 #include "config.h"
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16750
diff changeset
26 #include "mp_msg.h"
35706
bab4ce2b0d01 muxer_lavf: Replace forward declaration by the correct #include
diego
parents: 35589
diff changeset
27 #include "fmt-conversion.h"
17065
cf6bfdf41143 Clean up some muxer messages, patch by Corey Hickey bugfood-ml AT -fatooh/org- , small fixes by me
reynaldo
parents: 17023
diff changeset
28 #include "help_mp.h"
32064
a735105a66b6 Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents: 31531
diff changeset
29 #include "mencoder.h"
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
30 #include "aviheader.h"
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
31 #include "ms_hdr.h"
26695
1af41774481b AVOptions support for lavf muxing.
michael
parents: 26690
diff changeset
32 #include "av_opts.h"
33871
30f5e5cd3676 Move code for setting up libav* logging callbacks from vd_ffmpeg to a
reimar
parents: 33194
diff changeset
33 #include "av_helpers.h"
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
34
22605
4d81dbdf46b9 Add explicit location for headers from the stream/ directory.
diego
parents: 22220
diff changeset
35 #include "stream/stream.h"
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
36 #include "muxer.h"
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
37 #include "demuxer.h"
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
38 #include "stheader.h"
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16750
diff changeset
39 #include "m_option.h"
26069
1318e956c092 FFmpeg now uses different (unified) #include paths.
diego
parents: 25117
diff changeset
40 #include "libavformat/avformat.h"
23602
a7dc7b4c1401 pstrcpy -> av_strlcpy
reimar
parents: 23321
diff changeset
41 #include "libavutil/avstring.h"
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
42
26328
11aac031b4b7 Split the lavf taglists out of the lavf muxer to allow using libmpmux
albeu
parents: 26069
diff changeset
43 #include "mp_taglists.h"
24124
d2f65b67e568 Add missing pixelformat conversion function prototype
reimar
parents: 23956
diff changeset
44
26816
e77942d2d664 Use av_alloc_put_byte instead of custom protocol.
reimar
parents: 26702
diff changeset
45 #define BIO_BUFFER_SIZE 32768
e77942d2d664 Use av_alloc_put_byte instead of custom protocol.
reimar
parents: 26702
diff changeset
46
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
47 typedef struct {
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
48 //AVInputFormat *avif;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
49 AVFormatContext *oc;
33936
f27fe61c62f7 Replace deprecated functionality in muxer_lavf.
reimar
parents: 33871
diff changeset
50 AVIOContext *pb;
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
51 int audio_streams;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
52 int video_streams;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
53 int64_t last_pts;
26816
e77942d2d664 Use av_alloc_put_byte instead of custom protocol.
reimar
parents: 26702
diff changeset
54 uint8_t buffer[BIO_BUFFER_SIZE];
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
55 } muxer_priv_t;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
56
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
57 typedef struct {
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
58 int64_t last_pts;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
59 AVStream *avstream;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
60 } muxer_stream_priv_t;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
61
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
62 static char *conf_format = NULL;
17480
3993a5fad89a pass vbv_size & max_rate from encoder to muxer over muxer_stream_t (if this is wrong/silly/10000000l then dont hesitate to flame / reverse)
michael
parents: 17479
diff changeset
63 static int mux_rate= 0;
3993a5fad89a pass vbv_size & max_rate from encoder to muxer over muxer_stream_t (if this is wrong/silly/10000000l then dont hesitate to flame / reverse)
michael
parents: 17479
diff changeset
64 static int mux_packet_size= 0;
3993a5fad89a pass vbv_size & max_rate from encoder to muxer over muxer_stream_t (if this is wrong/silly/10000000l then dont hesitate to flame / reverse)
michael
parents: 17479
diff changeset
65 static float mux_preload= 0.5;
3993a5fad89a pass vbv_size & max_rate from encoder to muxer over muxer_stream_t (if this is wrong/silly/10000000l then dont hesitate to flame / reverse)
michael
parents: 17479
diff changeset
66 static float mux_max_delay= 0.7;
26695
1af41774481b AVOptions support for lavf muxing.
michael
parents: 26690
diff changeset
67 static char *mux_avopt = NULL;
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
68
30958
d05a77bed63f Mark muxer-related m_option_t arrays as const.
diego
parents: 30702
diff changeset
69 const m_option_t lavfopts_conf[] = {
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
70 {"format", &(conf_format), CONF_TYPE_STRING, 0, 0, 0, NULL},
17480
3993a5fad89a pass vbv_size & max_rate from encoder to muxer over muxer_stream_t (if this is wrong/silly/10000000l then dont hesitate to flame / reverse)
michael
parents: 17479
diff changeset
71 {"muxrate", &mux_rate, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL},
3993a5fad89a pass vbv_size & max_rate from encoder to muxer over muxer_stream_t (if this is wrong/silly/10000000l then dont hesitate to flame / reverse)
michael
parents: 17479
diff changeset
72 {"packetsize", &mux_packet_size, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL},
3993a5fad89a pass vbv_size & max_rate from encoder to muxer over muxer_stream_t (if this is wrong/silly/10000000l then dont hesitate to flame / reverse)
michael
parents: 17479
diff changeset
73 {"preload", &mux_preload, CONF_TYPE_FLOAT, CONF_RANGE, 0, INT_MAX, NULL},
3993a5fad89a pass vbv_size & max_rate from encoder to muxer over muxer_stream_t (if this is wrong/silly/10000000l then dont hesitate to flame / reverse)
michael
parents: 17479
diff changeset
74 {"delay", &mux_max_delay, CONF_TYPE_FLOAT, CONF_RANGE, 0, INT_MAX, NULL},
26695
1af41774481b AVOptions support for lavf muxing.
michael
parents: 26690
diff changeset
75 {"o", &mux_avopt, CONF_TYPE_STRING, 0, 0, 0, NULL},
17480
3993a5fad89a pass vbv_size & max_rate from encoder to muxer over muxer_stream_t (if this is wrong/silly/10000000l then dont hesitate to flame / reverse)
michael
parents: 17479
diff changeset
76
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
77 {NULL, NULL, 0, 0, 0, 0, NULL}
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
78 };
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
79
26816
e77942d2d664 Use av_alloc_put_byte instead of custom protocol.
reimar
parents: 26702
diff changeset
80 static int mp_write(void *opaque, uint8_t *buf, int size)
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
81 {
26816
e77942d2d664 Use av_alloc_put_byte instead of custom protocol.
reimar
parents: 26702
diff changeset
82 muxer_t *muxer = opaque;
21660
ca9da45d13e9 muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents: 21372
diff changeset
83 return stream_write_buffer(muxer->stream, buf, size);
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
84 }
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
85
27656
3029d0e351a5 fix compilation w/ FFmpeg r15533
gpoirier
parents: 26816
diff changeset
86 static int64_t mp_seek(void *opaque, int64_t pos, int whence)
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
87 {
26816
e77942d2d664 Use av_alloc_put_byte instead of custom protocol.
reimar
parents: 26702
diff changeset
88 muxer_t *muxer = opaque;
21660
ca9da45d13e9 muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents: 21372
diff changeset
89 if(whence == SEEK_CUR)
ca9da45d13e9 muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents: 21372
diff changeset
90 {
ca9da45d13e9 muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents: 21372
diff changeset
91 off_t cur = stream_tell(muxer->stream);
ca9da45d13e9 muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents: 21372
diff changeset
92 if(cur == -1)
ca9da45d13e9 muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents: 21372
diff changeset
93 return -1;
ca9da45d13e9 muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents: 21372
diff changeset
94 pos += cur;
ca9da45d13e9 muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents: 21372
diff changeset
95 }
ca9da45d13e9 muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents: 21372
diff changeset
96 else if(whence == SEEK_END)
ca9da45d13e9 muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents: 21372
diff changeset
97 {
35266
ceb148e1fe31 Change STREAM_CTRL_GET_SIZE argument type from off_t to
reimar
parents: 34540
diff changeset
98 uint64_t size=0;
24257
d261f5109660 cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
diego
parents: 24124
diff changeset
99 if(stream_control(muxer->stream, STREAM_CTRL_GET_SIZE, &size) == STREAM_UNSUPPORTED || size < pos)
21660
ca9da45d13e9 muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents: 21372
diff changeset
100 return -1;
ca9da45d13e9 muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents: 21372
diff changeset
101 pos = size - pos;
ca9da45d13e9 muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents: 21372
diff changeset
102 }
20740
a2a3094c5c09 fprintf -> mp_msg
michael
parents: 19360
diff changeset
103 mp_msg(MSGT_MUXER, MSGL_DBG2, "SEEK %"PRIu64"\n", (int64_t)pos);
21660
ca9da45d13e9 muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents: 21372
diff changeset
104 if(!stream_seek(muxer->stream, pos))
ca9da45d13e9 muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents: 21372
diff changeset
105 return -1;
ca9da45d13e9 muxers now write to output muxer->stream rather than to muxer->file
nicodvb
parents: 21372
diff changeset
106 return 0;
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
107 }
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
108
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
109
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
110 static muxer_stream_t* lavf_new_stream(muxer_t *muxer, int type)
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
111 {
17846
27e97a75ef70 recommitted version 1.22 + Rich's 1.25
nicodvb
parents: 17834
diff changeset
112 muxer_priv_t *priv = muxer->priv;
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
113 muxer_stream_t *stream;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
114 muxer_stream_priv_t *spriv;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
115 AVCodecContext *ctx;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
116
35314
eaace9a7e822 Simplify: remove useless casts, NULL checks etc.
reimar
parents: 35312
diff changeset
117 if(type != MUXER_TYPE_VIDEO && type != MUXER_TYPE_AUDIO)
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
118 {
26702
b5e7063ffade cosmetics: wording/spelling fixes
diego
parents: 26695
diff changeset
119 mp_msg(MSGT_MUXER, MSGL_ERR, "UNKNOWN TYPE %d\n", type);
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
120 return NULL;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
121 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
122
17830
e640ecc0be46 fix cosmetics noticed during nico's 10l
rfelker
parents: 17829
diff changeset
123 stream = calloc(1, sizeof(muxer_stream_t));
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
124 if(!stream)
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
125 {
26702
b5e7063ffade cosmetics: wording/spelling fixes
diego
parents: 26695
diff changeset
126 mp_msg(MSGT_MUXER, MSGL_ERR, "Could not allocate muxer_stream, EXIT.\n");
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
127 return NULL;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
128 }
17023
dd5be8f8d16d buffering in the muxer layer; patch by Corey Hickey (bugfood-ml ad fatooh punctum org) plus small fixes by me
nicodvb
parents: 17012
diff changeset
129 muxer->streams[muxer->avih.dwStreams] = stream;
17830
e640ecc0be46 fix cosmetics noticed during nico's 10l
rfelker
parents: 17829
diff changeset
130 stream->b_buffer = malloc(2048);
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
131 if(!stream->b_buffer)
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
132 {
26702
b5e7063ffade cosmetics: wording/spelling fixes
diego
parents: 26695
diff changeset
133 mp_msg(MSGT_MUXER, MSGL_ERR, "Could not allocate b_buffer, EXIT.\n");
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
134 free(stream);
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
135 return NULL;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
136 }
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
137 stream->b_buffer_size = 2048;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
138 stream->b_buffer_ptr = 0;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
139 stream->b_buffer_len = 0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
140
17830
e640ecc0be46 fix cosmetics noticed during nico's 10l
rfelker
parents: 17829
diff changeset
141 spriv = calloc(1, sizeof(muxer_stream_priv_t));
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
142 if(!spriv)
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
143 {
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
144 free(stream);
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
145 return NULL;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
146 }
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
147 stream->priv = spriv;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
148
34540
2b07cfa69882 Use avformat_new_stream.
reimar
parents: 34539
diff changeset
149 spriv->avstream = avformat_new_stream(priv->oc, NULL);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
150 if(!spriv->avstream)
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
151 {
26702
b5e7063ffade cosmetics: wording/spelling fixes
diego
parents: 26695
diff changeset
152 mp_msg(MSGT_MUXER, MSGL_ERR, "Could not allocate avstream, EXIT.\n");
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
153 return NULL;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
154 }
34540
2b07cfa69882 Use avformat_new_stream.
reimar
parents: 34539
diff changeset
155 spriv->avstream->id = 1;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
156
16001
b939c687986f LIBAVFORMAT_BUILD >= 4629
michael
parents: 15500
diff changeset
157 ctx = spriv->avstream->codec;
35715
8517826b0dbd Replace CODEC_IDs their modern AV_-prefixed counterparts.
diego
parents: 35706
diff changeset
158 ctx->codec_id = AV_CODEC_ID_NONE;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
159 switch(type)
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
160 {
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
161 case MUXER_TYPE_VIDEO:
32768
3544ba7244bf Change deprecated PKT_FLAG_KEY, CODEC_TYPE_* and SAMPLE_FMT_* to their
reimar
parents: 32542
diff changeset
162 ctx->codec_type = AVMEDIA_TYPE_VIDEO;
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
163 break;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
164 case MUXER_TYPE_AUDIO:
32768
3544ba7244bf Change deprecated PKT_FLAG_KEY, CODEC_TYPE_* and SAMPLE_FMT_* to their
reimar
parents: 32542
diff changeset
165 ctx->codec_type = AVMEDIA_TYPE_AUDIO;
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
166 break;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
167 }
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
168
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
169 muxer->avih.dwStreams++;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
170 stream->muxer = muxer;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
171 stream->type = type;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
172 mp_msg(MSGT_MUXER, MSGL_V, "ALLOCATED STREAM N. %d, type=%d\n", muxer->avih.dwStreams, type);
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
173 return stream;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
174 }
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
175
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
176
15058
f48dc20c9185 - fix gcc warnings, strlcat/strlcpy prototypes
rathann
parents: 15011
diff changeset
177 static void fix_parameters(muxer_stream_t *stream)
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
178 {
35312
3e6a575bd47b Simplify code.
reimar
parents: 35266
diff changeset
179 muxer_stream_priv_t *spriv = stream->priv;
3e6a575bd47b Simplify code.
reimar
parents: 35266
diff changeset
180 AVCodecContext *ctx = spriv->avstream->codec;
19073
8b52dad54b1d Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
diego
parents: 18554
diff changeset
181
19360
d4d72e5eea07 pass average bitrate from encoder to (lavf) muxer
michael
parents: 19073
diff changeset
182 ctx->bit_rate= stream->avg_rate;
17480
3993a5fad89a pass vbv_size & max_rate from encoder to muxer over muxer_stream_t (if this is wrong/silly/10000000l then dont hesitate to flame / reverse)
michael
parents: 17479
diff changeset
183 ctx->rc_buffer_size= stream->vbv_size;
3993a5fad89a pass vbv_size & max_rate from encoder to muxer over muxer_stream_t (if this is wrong/silly/10000000l then dont hesitate to flame / reverse)
michael
parents: 17479
diff changeset
184 ctx->rc_max_rate= stream->max_rate;
3993a5fad89a pass vbv_size & max_rate from encoder to muxer over muxer_stream_t (if this is wrong/silly/10000000l then dont hesitate to flame / reverse)
michael
parents: 17479
diff changeset
185
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
186 if(stream->type == MUXER_TYPE_AUDIO)
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
187 {
35312
3e6a575bd47b Simplify code.
reimar
parents: 35266
diff changeset
188 if (!ctx->bit_rate)
3e6a575bd47b Simplify code.
reimar
parents: 35266
diff changeset
189 ctx->bit_rate = stream->wf->nAvgBytesPerSec * 8;
34155
505b49b171f4 Change codec tag/id conversion to not use ff_codec_bmp_tags/ff_codec_wav_tags.
reimar
parents: 33936
diff changeset
190 ctx->codec_id = mp_tag2codec_id(stream->wf->wFormatTag, 1);
17482
e6dc1aeaf8a5 fix aac in mov/mp4
michael
parents: 17480
diff changeset
191 #if 0 //breaks aac in mov at least
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
192 ctx->codec_tag = codec_get_wav_tag(ctx->codec_id);
17482
e6dc1aeaf8a5 fix aac in mov/mp4
michael
parents: 17480
diff changeset
193 #endif
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
194 mp_msg(MSGT_MUXER, MSGL_INFO, "AUDIO CODEC ID: %x, TAG: %x\n", ctx->codec_id, (uint32_t) ctx->codec_tag);
15005
4abf8628ee74 1000l (dwSampleSize != nSamplesPerSec)
michael
parents: 14757
diff changeset
195 ctx->sample_rate = stream->wf->nSamplesPerSec;
4abf8628ee74 1000l (dwSampleSize != nSamplesPerSec)
michael
parents: 14757
diff changeset
196 // mp_msg(MSGT_MUXER, MSGL_INFO, "stream->h.dwSampleSize: %d\n", stream->h.dwSampleSize);
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
197 ctx->channels = stream->wf->nChannels;
15011
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15005
diff changeset
198 if(stream->h.dwRate && (stream->h.dwScale * (int64_t)ctx->sample_rate) % stream->h.dwRate == 0)
83077e6742e7 various (de)muxer_lavf fixes
michael
parents: 15005
diff changeset
199 ctx->frame_size= (stream->h.dwScale * (int64_t)ctx->sample_rate) / stream->h.dwRate;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
200 mp_msg(MSGT_MUXER, MSGL_V, "MUXER_LAVF(audio stream) frame_size: %d, scale: %u, sps: %u, rate: %u, ctx->block_align = stream->wf->nBlockAlign; %d=%d stream->wf->nAvgBytesPerSec:%d\n",
15198
847a9a75baa0 added missing initializer in URLProtocolo; mux packets only if len > 0; second mencoder's a/v sync model
nicodvb
parents: 15058
diff changeset
201 ctx->frame_size, stream->h.dwScale, ctx->sample_rate, stream->h.dwRate,
847a9a75baa0 added missing initializer in URLProtocolo; mux packets only if len > 0; second mencoder's a/v sync model
nicodvb
parents: 15058
diff changeset
202 ctx->block_align, stream->wf->nBlockAlign, stream->wf->nAvgBytesPerSec);
17484
43ac198cb5cf correct block align
michael
parents: 17482
diff changeset
203 ctx->block_align = stream->h.dwSampleSize;
15500
41fd530bd7a9 mux extradata
nicodvb
parents: 15314
diff changeset
204 if(stream->wf+1 && stream->wf->cbSize)
41fd530bd7a9 mux extradata
nicodvb
parents: 15314
diff changeset
205 {
41fd530bd7a9 mux extradata
nicodvb
parents: 15314
diff changeset
206 ctx->extradata = av_malloc(stream->wf->cbSize);
41fd530bd7a9 mux extradata
nicodvb
parents: 15314
diff changeset
207 if(ctx->extradata != NULL)
41fd530bd7a9 mux extradata
nicodvb
parents: 15314
diff changeset
208 {
41fd530bd7a9 mux extradata
nicodvb
parents: 15314
diff changeset
209 ctx->extradata_size = stream->wf->cbSize;
41fd530bd7a9 mux extradata
nicodvb
parents: 15314
diff changeset
210 memcpy(ctx->extradata, stream->wf+1, ctx->extradata_size);
41fd530bd7a9 mux extradata
nicodvb
parents: 15314
diff changeset
211 }
41fd530bd7a9 mux extradata
nicodvb
parents: 15314
diff changeset
212 else
26702
b5e7063ffade cosmetics: wording/spelling fixes
diego
parents: 26695
diff changeset
213 mp_msg(MSGT_MUXER, MSGL_ERR, "MUXER_LAVF(audio stream) error! Could not allocate %d bytes for extradata.\n",
15500
41fd530bd7a9 mux extradata
nicodvb
parents: 15314
diff changeset
214 stream->wf->cbSize);
41fd530bd7a9 mux extradata
nicodvb
parents: 15314
diff changeset
215 }
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
216 }
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
217 else if(stream->type == MUXER_TYPE_VIDEO)
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
218 {
34155
505b49b171f4 Change codec tag/id conversion to not use ff_codec_bmp_tags/ff_codec_wav_tags.
reimar
parents: 33936
diff changeset
219 ctx->codec_id = mp_tag2codec_id(stream->bih->biCompression, 0);
21960
0b4d2b0e8722 support -ffourcc with -of lavf
reimar
parents: 21822
diff changeset
220 if(ctx->codec_id <= 0 || force_fourcc)
17482
e6dc1aeaf8a5 fix aac in mov/mp4
michael
parents: 17480
diff changeset
221 ctx->codec_tag= stream->bih->biCompression;
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
222 mp_msg(MSGT_MUXER, MSGL_INFO, "VIDEO CODEC ID: %d\n", ctx->codec_id);
23320
5ea7c5d20f09 PIX_FMT_NONE is -1, not 0, so if stream->imgfmt is 0, ctx->pix_fmt gets
corey
parents: 23309
diff changeset
223 if (stream->imgfmt)
23321
ab8f2f9afd51 cosmetics: fix indentation for previous commit
corey
parents: 23320
diff changeset
224 ctx->pix_fmt = imgfmt2pixfmt(stream->imgfmt);
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
225 ctx->width = stream->bih->biWidth;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
226 ctx->height = stream->bih->biHeight;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
227 ctx->bit_rate = 800000;
15309
cfbd8e4b3ede at lest this fixes build.. there's no way muxer_lavf is working right yet tho with mencoder's broken timestamps
rfelker
parents: 15198
diff changeset
228 ctx->time_base.den = stream->h.dwRate;
cfbd8e4b3ede at lest this fixes build.. there's no way muxer_lavf is working right yet tho with mencoder's broken timestamps
rfelker
parents: 15198
diff changeset
229 ctx->time_base.num = stream->h.dwScale;
35589
ba53cfe2547b lavf muxer: set up stream aspect.
reimar
parents: 35315
diff changeset
230 if (stream->aspect)
ba53cfe2547b lavf muxer: set up stream aspect.
reimar
parents: 35315
diff changeset
231 ctx->sample_aspect_ratio =
ba53cfe2547b lavf muxer: set up stream aspect.
reimar
parents: 35315
diff changeset
232 spriv->avstream->sample_aspect_ratio = av_d2q(stream->aspect * ctx->height / ctx->width, 255);
ba53cfe2547b lavf muxer: set up stream aspect.
reimar
parents: 35315
diff changeset
233
35315
56081c772b4a Remove another pointless NULL check.
reimar
parents: 35314
diff changeset
234 if(stream->bih->biSize > sizeof(*stream->bih))
15500
41fd530bd7a9 mux extradata
nicodvb
parents: 15314
diff changeset
235 {
32100
0e09b34b0c47 Replace some sizeof(type) by sizeof(*pointer)
reimar
parents: 32064
diff changeset
236 ctx->extradata_size = stream->bih->biSize - sizeof(*stream->bih);
21810
7a36d3332133 sizeof() is long, thus %d format in error message is wrong.
reimar
parents: 21771
diff changeset
237 ctx->extradata = av_malloc(ctx->extradata_size);
15500
41fd530bd7a9 mux extradata
nicodvb
parents: 15314
diff changeset
238 if(ctx->extradata != NULL)
41fd530bd7a9 mux extradata
nicodvb
parents: 15314
diff changeset
239 memcpy(ctx->extradata, stream->bih+1, ctx->extradata_size);
21810
7a36d3332133 sizeof() is long, thus %d format in error message is wrong.
reimar
parents: 21771
diff changeset
240 else
7a36d3332133 sizeof() is long, thus %d format in error message is wrong.
reimar
parents: 21771
diff changeset
241 {
26702
b5e7063ffade cosmetics: wording/spelling fixes
diego
parents: 26695
diff changeset
242 mp_msg(MSGT_MUXER, MSGL_ERR, "MUXER_LAVF(video stream) error! Could not allocate %d bytes for extradata.\n",
21810
7a36d3332133 sizeof() is long, thus %d format in error message is wrong.
reimar
parents: 21771
diff changeset
243 ctx->extradata_size);
7a36d3332133 sizeof() is long, thus %d format in error message is wrong.
reimar
parents: 21771
diff changeset
244 ctx->extradata_size = 0;
15500
41fd530bd7a9 mux extradata
nicodvb
parents: 15314
diff changeset
245 }
41fd530bd7a9 mux extradata
nicodvb
parents: 15314
diff changeset
246 }
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
247 }
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
248 }
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
249
17487
fa17424b4c7b change muxer_write_chunk() so that pts/dts _could_ be passed from encoder to muxer
michael
parents: 17485
diff changeset
250 static void write_chunk(muxer_stream_t *stream, size_t len, unsigned int flags, double dts, double pts)
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
251 {
34538
4b2275e890ac Remove pointless casts.
reimar
parents: 34537
diff changeset
252 muxer_t *muxer = stream->muxer;
4b2275e890ac Remove pointless casts.
reimar
parents: 34537
diff changeset
253 muxer_priv_t *priv = muxer->priv;
35314
eaace9a7e822 Simplify: remove useless casts, NULL checks etc.
reimar
parents: 35312
diff changeset
254 muxer_stream_priv_t *spriv = stream->priv;
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
255 AVPacket pkt;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
256
15198
847a9a75baa0 added missing initializer in URLProtocolo; mux packets only if len > 0; second mencoder's a/v sync model
nicodvb
parents: 15058
diff changeset
257 if(len)
847a9a75baa0 added missing initializer in URLProtocolo; mux packets only if len > 0; second mencoder's a/v sync model
nicodvb
parents: 15058
diff changeset
258 {
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
259 av_init_packet(&pkt);
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
260 pkt.size = len;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
261 pkt.stream_index= spriv->avstream->index;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
262 pkt.data = stream->buffer;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
263
15198
847a9a75baa0 added missing initializer in URLProtocolo; mux packets only if len > 0; second mencoder's a/v sync model
nicodvb
parents: 15058
diff changeset
264 if(flags & AVIIF_KEYFRAME)
32768
3544ba7244bf Change deprecated PKT_FLAG_KEY, CODEC_TYPE_* and SAMPLE_FMT_* to their
reimar
parents: 32542
diff changeset
265 pkt.flags |= AV_PKT_FLAG_KEY;
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
266 else
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
267 pkt.flags = 0;
23955
c4c4712cebae make muxer store the provided timestamps
michael
parents: 23602
diff changeset
268
c4c4712cebae make muxer store the provided timestamps
michael
parents: 23602
diff changeset
269 pkt.dts = (dts / av_q2d(priv->oc->streams[pkt.stream_index]->time_base) + 0.5);
c4c4712cebae make muxer store the provided timestamps
michael
parents: 23602
diff changeset
270 pkt.pts = (pts / av_q2d(priv->oc->streams[pkt.stream_index]->time_base) + 0.5);
15314
5ca3a981d62a fix timestamps
michael
parents: 15309
diff changeset
271 //fprintf(stderr, "%Ld %Ld id:%d tb:%f %f\n", pkt.dts, pkt.pts, pkt.stream_index, av_q2d(priv->oc->streams[pkt.stream_index]->time_base), stream->timer);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
272
15198
847a9a75baa0 added missing initializer in URLProtocolo; mux packets only if len > 0; second mencoder's a/v sync model
nicodvb
parents: 15058
diff changeset
273 if(av_interleaved_write_frame(priv->oc, &pkt) != 0) //av_write_frame(priv->oc, &pkt)
847a9a75baa0 added missing initializer in URLProtocolo; mux packets only if len > 0; second mencoder's a/v sync model
nicodvb
parents: 15058
diff changeset
274 {
26702
b5e7063ffade cosmetics: wording/spelling fixes
diego
parents: 26695
diff changeset
275 mp_msg(MSGT_MUXER, MSGL_ERR, "Error while writing frame.\n");
15198
847a9a75baa0 added missing initializer in URLProtocolo; mux packets only if len > 0; second mencoder's a/v sync model
nicodvb
parents: 15058
diff changeset
276 }
847a9a75baa0 added missing initializer in URLProtocolo; mux packets only if len > 0; second mencoder's a/v sync model
nicodvb
parents: 15058
diff changeset
277 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
278
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
279 return;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
280 }
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
281
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
282
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
283 static void write_header(muxer_t *muxer)
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
284 {
34538
4b2275e890ac Remove pointless casts.
reimar
parents: 34537
diff changeset
285 muxer_priv_t *priv = muxer->priv;
34539
88bd2174f616 Set muxrate and preload via AVDictionary.
reimar
parents: 34538
diff changeset
286 AVDictionary *opts = NULL;
88bd2174f616 Set muxrate and preload via AVDictionary.
reimar
parents: 34538
diff changeset
287 char tmpstr[50];
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
288
17065
cf6bfdf41143 Clean up some muxer messages, patch by Corey Hickey bugfood-ml AT -fatooh/org- , small fixes by me
reynaldo
parents: 17023
diff changeset
289 mp_msg(MSGT_MUXER, MSGL_INFO, MSGTR_WritingHeader);
34539
88bd2174f616 Set muxrate and preload via AVDictionary.
reimar
parents: 34538
diff changeset
290 if (mux_rate) {
88bd2174f616 Set muxrate and preload via AVDictionary.
reimar
parents: 34538
diff changeset
291 snprintf(tmpstr, sizeof(tmpstr), "%i", mux_rate);
88bd2174f616 Set muxrate and preload via AVDictionary.
reimar
parents: 34538
diff changeset
292 av_dict_set(&opts, "muxrate", tmpstr, 0);
88bd2174f616 Set muxrate and preload via AVDictionary.
reimar
parents: 34538
diff changeset
293 }
88bd2174f616 Set muxrate and preload via AVDictionary.
reimar
parents: 34538
diff changeset
294 if (mux_preload) {
88bd2174f616 Set muxrate and preload via AVDictionary.
reimar
parents: 34538
diff changeset
295 snprintf(tmpstr, sizeof(tmpstr), "%i", (int)(mux_preload * AV_TIME_BASE));
88bd2174f616 Set muxrate and preload via AVDictionary.
reimar
parents: 34538
diff changeset
296 av_dict_set(&opts, "preload", tmpstr, 0);
88bd2174f616 Set muxrate and preload via AVDictionary.
reimar
parents: 34538
diff changeset
297 }
88bd2174f616 Set muxrate and preload via AVDictionary.
reimar
parents: 34538
diff changeset
298 avformat_write_header(priv->oc, &opts);
88bd2174f616 Set muxrate and preload via AVDictionary.
reimar
parents: 34538
diff changeset
299 av_dict_free(&opts);
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
300 muxer->cont_write_header = NULL;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
301 }
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
302
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
303
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
304 static void write_trailer(muxer_t *muxer)
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
305 {
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
306 int i;
34538
4b2275e890ac Remove pointless casts.
reimar
parents: 34537
diff changeset
307 muxer_priv_t *priv = muxer->priv;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
308
17065
cf6bfdf41143 Clean up some muxer messages, patch by Corey Hickey bugfood-ml AT -fatooh/org- , small fixes by me
reynaldo
parents: 17023
diff changeset
309 mp_msg(MSGT_MUXER, MSGL_INFO, MSGTR_WritingTrailer);
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
310 av_write_trailer(priv->oc);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
311 for(i = 0; i < priv->oc->nb_streams; i++)
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
312 {
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
313 av_freep(&(priv->oc->streams[i]));
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
314 }
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
315
26816
e77942d2d664 Use av_alloc_put_byte instead of custom protocol.
reimar
parents: 26702
diff changeset
316 av_freep(&priv->oc->pb);
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
317
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
318 av_free(priv->oc);
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
319 }
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
320
22198
0d59af1f4156 Print list of lavf muxer formats with format=help.
reimar
parents: 21966
diff changeset
321 static void list_formats(void) {
0d59af1f4156 Print list of lavf muxer formats with format=help.
reimar
parents: 21966
diff changeset
322 AVOutputFormat *fmt;
0d59af1f4156 Print list of lavf muxer formats with format=help.
reimar
parents: 21966
diff changeset
323 mp_msg(MSGT_DEMUX, MSGL_INFO, "Available lavf output formats:\n");
33193
63e07c08041a Avoid using first_oformat, use av_oformat_next() instead.
reimar
parents: 32768
diff changeset
324 for (fmt = av_oformat_next(NULL); fmt; fmt = av_oformat_next(fmt))
22198
0d59af1f4156 Print list of lavf muxer formats with format=help.
reimar
parents: 21966
diff changeset
325 mp_msg(MSGT_DEMUX, MSGL_INFO, "%15s : %s\n", fmt->name, fmt->long_name);
0d59af1f4156 Print list of lavf muxer formats with format=help.
reimar
parents: 21966
diff changeset
326 }
0d59af1f4156 Print list of lavf muxer formats with format=help.
reimar
parents: 21966
diff changeset
327
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
328 int muxer_init_muxer_lavf(muxer_t *muxer)
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
329 {
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
330 muxer_priv_t *priv;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
331 AVOutputFormat *fmt = NULL;
17079
c3893e949327 muxer_lavf MUST be disabled by default until someone adds AVParser
rfelker
parents: 17065
diff changeset
332
33871
30f5e5cd3676 Move code for setting up libav* logging callbacks from vd_ffmpeg to a
reimar
parents: 33194
diff changeset
333 init_avformat();
22198
0d59af1f4156 Print list of lavf muxer formats with format=help.
reimar
parents: 21966
diff changeset
334
22220
3687d95f3715 Don't segfault if no -format is given for lavf
uau
parents: 22198
diff changeset
335 if (conf_format && strcmp(conf_format, "help") == 0) {
22198
0d59af1f4156 Print list of lavf muxer formats with format=help.
reimar
parents: 21966
diff changeset
336 list_formats();
0d59af1f4156 Print list of lavf muxer formats with format=help.
reimar
parents: 21966
diff changeset
337 return 0;
0d59af1f4156 Print list of lavf muxer formats with format=help.
reimar
parents: 21966
diff changeset
338 }
0d59af1f4156 Print list of lavf muxer formats with format=help.
reimar
parents: 21966
diff changeset
339
17079
c3893e949327 muxer_lavf MUST be disabled by default until someone adds AVParser
rfelker
parents: 17065
diff changeset
340 mp_msg(MSGT_MUXER, MSGL_WARN, "** MUXER_LAVF *****************************************************************\n");
c3893e949327 muxer_lavf MUST be disabled by default until someone adds AVParser
rfelker
parents: 17065
diff changeset
341 mp_msg(MSGT_MUXER, MSGL_WARN,
23956
a0d1fe96bdb8 get rid of this idiotic i_certify_that_my_video_stream_does_not_use_b_frames
michael
parents: 23955
diff changeset
342 "REMEMBER: MEncoder's libavformat muxing is presently broken and can generate\n"
26702
b5e7063ffade cosmetics: wording/spelling fixes
diego
parents: 26695
diff changeset
343 "INCORRECT files in the presence of B-frames. Moreover, due to bugs MPlayer\n"
17079
c3893e949327 muxer_lavf MUST be disabled by default until someone adds AVParser
rfelker
parents: 17065
diff changeset
344 "will play these INCORRECT files as if nothing were wrong!\n"
c3893e949327 muxer_lavf MUST be disabled by default until someone adds AVParser
rfelker
parents: 17065
diff changeset
345 "*******************************************************************************\n");
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
346
30702
9fc9d1e788aa Do not cast the results of malloc/calloc/realloc.
diego
parents: 29920
diff changeset
347 priv = calloc(1, sizeof(muxer_priv_t));
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
348 if(priv == NULL)
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
349 return 0;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
350
31531
eaf15344b19d Avoid some deprecated functions.
reimar
parents: 30958
diff changeset
351 priv->oc = avformat_alloc_context();
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
352 if(!priv->oc)
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
353 {
26702
b5e7063ffade cosmetics: wording/spelling fixes
diego
parents: 26695
diff changeset
354 mp_msg(MSGT_MUXER, MSGL_FATAL, "Could not get format context.\n");
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
355 goto fail;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
356 }
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
357
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
358 if(conf_format)
31531
eaf15344b19d Avoid some deprecated functions.
reimar
parents: 30958
diff changeset
359 fmt = av_guess_format(conf_format, NULL, NULL);
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
360 if(! fmt)
31531
eaf15344b19d Avoid some deprecated functions.
reimar
parents: 30958
diff changeset
361 fmt = av_guess_format(NULL, out_filename, NULL);
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
362 if(! fmt)
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
363 {
26702
b5e7063ffade cosmetics: wording/spelling fixes
diego
parents: 26695
diff changeset
364 mp_msg(MSGT_MUXER, MSGL_FATAL, "Cannot get specified format.\n");
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
365 goto fail;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
366 }
36346
13e767d419fc Support ffmpeg://dummy:// in muxer_lavf.
reimar
parents: 36344
diff changeset
367 if (fmt->flags & AVFMT_NOFILE) {
13e767d419fc Support ffmpeg://dummy:// in muxer_lavf.
reimar
parents: 36344
diff changeset
368 const char *src = out_filename;
13e767d419fc Support ffmpeg://dummy:// in muxer_lavf.
reimar
parents: 36344
diff changeset
369 if (!strncmp(out_filename, "ffmpeg://dummy://", 17)) src += 17;
13e767d419fc Support ffmpeg://dummy:// in muxer_lavf.
reimar
parents: 36344
diff changeset
370 else if (!strncmp(out_filename, "ffmpeg://", 9)) src += 9;
13e767d419fc Support ffmpeg://dummy:// in muxer_lavf.
reimar
parents: 36344
diff changeset
371 av_strlcpy(priv->oc->filename, src, sizeof(priv->oc->filename));
13e767d419fc Support ffmpeg://dummy:// in muxer_lavf.
reimar
parents: 36344
diff changeset
372 }
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
373 priv->oc->oformat = fmt;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
374
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
375
17480
3993a5fad89a pass vbv_size & max_rate from encoder to muxer over muxer_stream_t (if this is wrong/silly/10000000l then dont hesitate to flame / reverse)
michael
parents: 17479
diff changeset
376 priv->oc->packet_size= mux_packet_size;
3993a5fad89a pass vbv_size & max_rate from encoder to muxer over muxer_stream_t (if this is wrong/silly/10000000l then dont hesitate to flame / reverse)
michael
parents: 17479
diff changeset
377 priv->oc->max_delay= (int)(mux_max_delay*AV_TIME_BASE);
18554
ebf5efd78cb6 metadata support
michael
parents: 17846
diff changeset
378 if (info_name)
33936
f27fe61c62f7 Replace deprecated functionality in muxer_lavf.
reimar
parents: 33871
diff changeset
379 av_dict_set(&priv->oc->metadata, "title", info_name, 0);
18554
ebf5efd78cb6 metadata support
michael
parents: 17846
diff changeset
380 if (info_artist)
33936
f27fe61c62f7 Replace deprecated functionality in muxer_lavf.
reimar
parents: 33871
diff changeset
381 av_dict_set(&priv->oc->metadata, "author", info_artist, 0);
18554
ebf5efd78cb6 metadata support
michael
parents: 17846
diff changeset
382 if (info_genre)
33936
f27fe61c62f7 Replace deprecated functionality in muxer_lavf.
reimar
parents: 33871
diff changeset
383 av_dict_set(&priv->oc->metadata, "genre", info_genre, 0);
18554
ebf5efd78cb6 metadata support
michael
parents: 17846
diff changeset
384 if (info_copyright)
33936
f27fe61c62f7 Replace deprecated functionality in muxer_lavf.
reimar
parents: 33871
diff changeset
385 av_dict_set(&priv->oc->metadata, "copyright", info_copyright, 0);
18554
ebf5efd78cb6 metadata support
michael
parents: 17846
diff changeset
386 if (info_comment)
33936
f27fe61c62f7 Replace deprecated functionality in muxer_lavf.
reimar
parents: 33871
diff changeset
387 av_dict_set(&priv->oc->metadata, "comment", info_comment, 0);
26695
1af41774481b AVOptions support for lavf muxing.
michael
parents: 26690
diff changeset
388
1af41774481b AVOptions support for lavf muxing.
michael
parents: 26690
diff changeset
389 if(mux_avopt){
1af41774481b AVOptions support for lavf muxing.
michael
parents: 26690
diff changeset
390 if(parse_avopts(priv->oc, mux_avopt) < 0){
26702
b5e7063ffade cosmetics: wording/spelling fixes
diego
parents: 26695
diff changeset
391 mp_msg(MSGT_MUXER,MSGL_ERR, "Your options /%s/ look like gibberish to me pal.\n", mux_avopt);
26695
1af41774481b AVOptions support for lavf muxing.
michael
parents: 26690
diff changeset
392 goto fail;
1af41774481b AVOptions support for lavf muxing.
michael
parents: 26690
diff changeset
393 }
1af41774481b AVOptions support for lavf muxing.
michael
parents: 26690
diff changeset
394 }
1af41774481b AVOptions support for lavf muxing.
michael
parents: 26690
diff changeset
395
33936
f27fe61c62f7 Replace deprecated functionality in muxer_lavf.
reimar
parents: 33871
diff changeset
396 priv->oc->pb = avio_alloc_context(priv->buffer, BIO_BUFFER_SIZE, 1, muxer, NULL, mp_write, mp_seek);
29920
4f740437ed2b Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
reimar
parents: 29263
diff changeset
397 if ((muxer->stream->flags & MP_STREAM_SEEK) != MP_STREAM_SEEK)
34536
e289f1cae2f1 Use "seekable" instead of is_streamed.
reimar
parents: 34535
diff changeset
398 priv->oc->pb->seekable = 0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
399
34537
cf72993a2a33 Remove pointless cast.
reimar
parents: 34536
diff changeset
400 muxer->priv = priv;
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
401 muxer->cont_new_stream = &lavf_new_stream;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
402 muxer->cont_write_chunk = &write_chunk;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
403 muxer->cont_write_header = &write_header;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
404 muxer->cont_write_index = &write_trailer;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
405 muxer->fix_stream_parameters = &fix_parameters;
26702
b5e7063ffade cosmetics: wording/spelling fixes
diego
parents: 26695
diff changeset
406 mp_msg(MSGT_MUXER, MSGL_INFO, "OK, exit.\n");
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
407 return 1;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
408
14757
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
409 fail:
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
410 free(priv);
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
411 return 0;
7a2adc5e8928 initial, extremely experimental, libavformat muxer; don't expect anything to work yet
nicodvb
parents:
diff changeset
412 }