* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <assert.h>
+
#include "libavutil/intreadwrite.h"
-#include "libavutil/intfloat_readwrite.h"
+#include "libavutil/intfloat.h"
#include "avformat.h"
+#include "internal.h"
#include "ffm.h"
static void flush_packet(AVFormatContext *s)
fill_size = ffm->packet_end - ffm->packet_ptr;
memset(ffm->packet_ptr, 0, fill_size);
- if (avio_tell(pb) % ffm->packet_size)
- av_abort();
+ assert(avio_tell(pb) % ffm->packet_size == 0);
/* put header */
avio_wb16(pb, PACKET_ID);
/* list of streams */
for(i=0;i<s->nb_streams;i++) {
st = s->streams[i];
- av_set_pts_info(st, 64, 1, 1000000);
+ avpriv_set_pts_info(st, 64, 1, 1000000);
codec = st->codec;
/* generic info */
avio_wb32(pb, codec->rc_max_rate);
avio_wb32(pb, codec->rc_min_rate);
avio_wb32(pb, codec->rc_buffer_size);
- avio_wb64(pb, av_dbl2int(codec->i_quant_factor));
- avio_wb64(pb, av_dbl2int(codec->b_quant_factor));
- avio_wb64(pb, av_dbl2int(codec->i_quant_offset));
- avio_wb64(pb, av_dbl2int(codec->b_quant_offset));
+ avio_wb64(pb, av_double2int(codec->i_quant_factor));
+ avio_wb64(pb, av_double2int(codec->b_quant_factor));
+ avio_wb64(pb, av_double2int(codec->i_quant_offset));
+ avio_wb64(pb, av_double2int(codec->b_quant_offset));
avio_wb32(pb, codec->dct_algo);
avio_wb32(pb, codec->strict_std_compliance);
avio_wb32(pb, codec->max_b_frames);
- avio_wb32(pb, codec->luma_elim_threshold);
- avio_wb32(pb, codec->chroma_elim_threshold);
avio_wb32(pb, codec->mpeg_quant);
avio_wb32(pb, codec->intra_dc_precision);
avio_wb32(pb, codec->me_method);
avio_wb32(pb, codec->mb_decision);
avio_wb32(pb, codec->nsse_weight);
avio_wb32(pb, codec->frame_skip_cmp);
- avio_wb64(pb, av_dbl2int(codec->rc_buffer_aggressivity));
+ avio_wb64(pb, av_double2int(codec->rc_buffer_aggressivity));
avio_wb32(pb, codec->codec_tag);
avio_w8(pb, codec->thread_count);
avio_wb32(pb, codec->coder_type);
avio_wb32(pb, codec->me_cmp);
- avio_wb32(pb, codec->partitions);
avio_wb32(pb, codec->me_subpel_quality);
avio_wb32(pb, codec->me_range);
avio_wb32(pb, codec->keyint_min);
avio_wb32(pb, codec->scenechange_threshold);
avio_wb32(pb, codec->b_frame_strategy);
- avio_wb64(pb, av_dbl2int(codec->qcompress));
- avio_wb64(pb, av_dbl2int(codec->qblur));
+ avio_wb64(pb, av_double2int(codec->qcompress));
+ avio_wb64(pb, av_double2int(codec->qblur));
avio_wb32(pb, codec->max_qdiff);
avio_wb32(pb, codec->refs);
- avio_wb32(pb, codec->directpred);
break;
case AVMEDIA_TYPE_AUDIO:
avio_wb32(pb, codec->sample_rate);
avio_wl16(pb, codec->channels);
avio_wl16(pb, codec->frame_size);
- avio_wl16(pb, codec->sample_fmt);
break;
default:
return -1;
uint8_t header[FRAME_HEADER_SIZE+4];
int header_size = FRAME_HEADER_SIZE;
- dts = s->timestamp + pkt->dts;
+ dts = pkt->dts;
/* packet size & key_frame */
header[0] = pkt->stream_index;
header[1] = 0;
header[1] |= FLAG_KEY_FRAME;
AV_WB24(header+2, pkt->size);
AV_WB24(header+5, pkt->duration);
- AV_WB64(header+8, s->timestamp + pkt->pts);
+ AV_WB64(header+8, pkt->pts);
if (pkt->pts != pkt->dts) {
header[1] |= FLAG_DTS;
AV_WB32(header+16, pkt->pts - pkt->dts);
static int ffm_write_trailer(AVFormatContext *s)
{
- AVIOContext *pb = s->pb;
FFMContext *ffm = s->priv_data;
/* flush packets */
if (ffm->packet_ptr > ffm->packet)
flush_packet(s);
- avio_flush(pb);
-
return 0;
}
AVOutputFormat ff_ffm_muxer = {
.name = "ffm",
- .long_name = NULL_IF_CONFIG_SMALL("FFM (AVserver live feed) format"),
+ .long_name = NULL_IF_CONFIG_SMALL("FFM (AVserver live feed)"),
.mime_type = "",
.extensions = "ffm",
.priv_data_size = sizeof(FFMContext),
- .audio_codec = CODEC_ID_MP2,
- .video_codec = CODEC_ID_MPEG1VIDEO,
+ .audio_codec = AV_CODEC_ID_MP2,
+ .video_codec = AV_CODEC_ID_MPEG1VIDEO,
.write_header = ffm_write_header,
.write_packet = ffm_write_packet,
.write_trailer = ffm_write_trailer,
+ .flags = AVFMT_TS_NEGATIVE,
};