mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge remote-tracking branch 'qatar/master'
* qatar/master: (23 commits) h264: hide reference frame errors unless requested swscale: split hScale() function pointer into h[cy]Scale(). Move clipd macros to x86util.asm. avconv: reindent. avconv: rescue poor abused start_time global. avconv: rescue poor abused recording_time global. avconv: merge two loops in output_packet(). avconv: fix broken indentation. avconv: get rid of the arbitrary MAX_FILES limit. avconv: get rid of the output_streams_for_file vs. ost_table schizophrenia avconv: add a wrapper for output AVFormatContexts and merge output_opts into it avconv: make itsscale syntax consistent with other options. avconv: factor out adding input streams. avconv: Factorize combining auto vsync with format. avconv: Factorize video resampling. avconv: Don't unnecessarily convert ipts to a double. ffmpeg: remove unsed variable nopts RV3/4 parser: remove unused variable 'off' add XMV demuxer rmdec: parse FPS in RealMedia properly ... Conflicts: avconv.c libavformat/version.h libswscale/swscale.c tests/ref/fate/lmlm4-demux Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
commit
edae3dbf1d
@ -41,6 +41,7 @@ easier to use. The changes are:
|
|||||||
* Presets in avconv are disabled, because only libx264 used them and
|
* Presets in avconv are disabled, because only libx264 used them and
|
||||||
presets for libx264 can now be specified using a private option
|
presets for libx264 can now be specified using a private option
|
||||||
'-preset <presetname>'.
|
'-preset <presetname>'.
|
||||||
|
- XMV demuxer
|
||||||
|
|
||||||
|
|
||||||
version 0.8:
|
version 0.8:
|
||||||
|
|||||||
@ -260,6 +260,8 @@ library:
|
|||||||
@tab Multimedia format used in Westwood Studios games.
|
@tab Multimedia format used in Westwood Studios games.
|
||||||
@item Westwood Studios VQA @tab @tab X
|
@item Westwood Studios VQA @tab @tab X
|
||||||
@tab Multimedia format used in Westwood Studios games.
|
@tab Multimedia format used in Westwood Studios games.
|
||||||
|
@item XMV @tab @tab X
|
||||||
|
@tab Microsoft video container used in Xbox games.
|
||||||
@item xWMA @tab @tab X
|
@item xWMA @tab @tab X
|
||||||
@tab Microsoft audio container used by XAudio 2.
|
@tab Microsoft audio container used by XAudio 2.
|
||||||
@item YUV4MPEG pipe @tab X @tab X
|
@item YUV4MPEG pipe @tab X @tab X
|
||||||
|
|||||||
23
ffmpeg.c
23
ffmpeg.c
@ -736,7 +736,6 @@ static int read_ffserver_streams(AVFormatContext *s, const char *filename)
|
|||||||
{
|
{
|
||||||
int i, err;
|
int i, err;
|
||||||
AVFormatContext *ic = NULL;
|
AVFormatContext *ic = NULL;
|
||||||
int nopts = 0;
|
|
||||||
|
|
||||||
err = avformat_open_input(&ic, filename, NULL, NULL);
|
err = avformat_open_input(&ic, filename, NULL, NULL);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
@ -768,9 +767,6 @@ static int read_ffserver_streams(AVFormatContext *s, const char *filename)
|
|||||||
} else
|
} else
|
||||||
choose_pixel_fmt(st, codec);
|
choose_pixel_fmt(st, codec);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(st->codec->flags & CODEC_FLAG_BITEXACT)
|
|
||||||
nopts = 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
av_close_input_file(ic);
|
av_close_input_file(ic);
|
||||||
@ -1725,6 +1721,14 @@ static int output_packet(InputStream *ist, int ist_index,
|
|||||||
int frame_size;
|
int frame_size;
|
||||||
|
|
||||||
ost = ost_table[i];
|
ost = ost_table[i];
|
||||||
|
|
||||||
|
/* finish if recording time exhausted */
|
||||||
|
if (recording_time != INT64_MAX &&
|
||||||
|
av_compare_ts(ist->pts, AV_TIME_BASE_Q, recording_time + start_time, (AVRational){1, 1000000})
|
||||||
|
>= 0) {
|
||||||
|
ist->is_past_recording_time = 1;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if (ost->source_index == ist_index) {
|
if (ost->source_index == ist_index) {
|
||||||
#if CONFIG_AVFILTER
|
#if CONFIG_AVFILTER
|
||||||
frame_available = ist->st->codec->codec_type != AVMEDIA_TYPE_VIDEO ||
|
frame_available = ist->st->codec->codec_type != AVMEDIA_TYPE_VIDEO ||
|
||||||
@ -2804,17 +2808,6 @@ static int transcode(AVFormatContext **output_files,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* finish if recording time exhausted */
|
|
||||||
if (recording_time != INT64_MAX &&
|
|
||||||
(pkt.pts != AV_NOPTS_VALUE ?
|
|
||||||
av_compare_ts(pkt.pts, ist->st->time_base, recording_time + start_time, (AVRational){1, 1000000})
|
|
||||||
:
|
|
||||||
av_compare_ts(ist->pts, AV_TIME_BASE_Q, recording_time + start_time, (AVRational){1, 1000000})
|
|
||||||
)>= 0) {
|
|
||||||
ist->is_past_recording_time = 1;
|
|
||||||
goto discard_packet;
|
|
||||||
}
|
|
||||||
|
|
||||||
//fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->st->index, pkt.size);
|
//fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->st->index, pkt.size);
|
||||||
if (output_packet(ist, ist_index, ost_table, nb_ostreams, &pkt) < 0) {
|
if (output_packet(ist, ist_index, ost_table, nb_ostreams, &pkt) < 0) {
|
||||||
|
|
||||||
|
|||||||
@ -635,6 +635,8 @@ OBJS-$(CONFIG_MPEGVIDEO_PARSER) += mpegvideo_parser.o \
|
|||||||
mpeg12.o mpeg12data.o \
|
mpeg12.o mpeg12data.o \
|
||||||
mpegvideo.o error_resilience.o
|
mpegvideo.o error_resilience.o
|
||||||
OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o
|
OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o
|
||||||
|
OBJS-$(CONFIG_RV30_PARSER) += rv34_parser.o
|
||||||
|
OBJS-$(CONFIG_RV40_PARSER) += rv34_parser.o
|
||||||
OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o vc1.o vc1data.o \
|
OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o vc1.o vc1data.o \
|
||||||
msmpeg4.o msmpeg4data.o mpeg4video.o \
|
msmpeg4.o msmpeg4data.o mpeg4video.o \
|
||||||
h263.o mpegvideo.o error_resilience.o
|
h263.o mpegvideo.o error_resilience.o
|
||||||
|
|||||||
@ -409,6 +409,8 @@ void avcodec_register_all(void)
|
|||||||
REGISTER_PARSER (MPEGAUDIO, mpegaudio);
|
REGISTER_PARSER (MPEGAUDIO, mpegaudio);
|
||||||
REGISTER_PARSER (MPEGVIDEO, mpegvideo);
|
REGISTER_PARSER (MPEGVIDEO, mpegvideo);
|
||||||
REGISTER_PARSER (PNM, pnm);
|
REGISTER_PARSER (PNM, pnm);
|
||||||
|
REGISTER_PARSER (RV30, rv30);
|
||||||
|
REGISTER_PARSER (RV40, rv40);
|
||||||
REGISTER_PARSER (VC1, vc1);
|
REGISTER_PARSER (VC1, vc1);
|
||||||
REGISTER_PARSER (VP3, vp3);
|
REGISTER_PARSER (VP3, vp3);
|
||||||
REGISTER_PARSER (VP8, vp8);
|
REGISTER_PARSER (VP8, vp8);
|
||||||
|
|||||||
@ -655,7 +655,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
|
|||||||
|
|
||||||
print_short_term(h);
|
print_short_term(h);
|
||||||
print_long_term(h);
|
print_long_term(h);
|
||||||
return err;
|
return h->s.avctx->error_recognition >= FF_ER_EXPLODE ? err : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int ff_h264_decode_ref_pic_marking(H264Context *h, GetBitContext *gb){
|
int ff_h264_decode_ref_pic_marking(H264Context *h, GetBitContext *gb){
|
||||||
|
|||||||
95
libavcodec/rv34_parser.c
Normal file
95
libavcodec/rv34_parser.c
Normal file
@ -0,0 +1,95 @@
|
|||||||
|
/*
|
||||||
|
* RV30/40 parser
|
||||||
|
* Copyright (c) 2011 Konstantin Shishkov
|
||||||
|
*
|
||||||
|
* This file is part of Libav.
|
||||||
|
*
|
||||||
|
* Libav is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 2.1 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Libav is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
|
* License along with Libav; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @file
|
||||||
|
* RV30/40 parser
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "parser.h"
|
||||||
|
#include "libavutil/intreadwrite.h"
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
ParseContext pc;
|
||||||
|
int64_t key_dts;
|
||||||
|
int key_pts;
|
||||||
|
} RV34ParseContext;
|
||||||
|
|
||||||
|
static const int rv_to_av_frame_type[4] = {
|
||||||
|
AV_PICTURE_TYPE_I, AV_PICTURE_TYPE_I, AV_PICTURE_TYPE_P, AV_PICTURE_TYPE_B,
|
||||||
|
};
|
||||||
|
|
||||||
|
static int rv34_parse(AVCodecParserContext *s,
|
||||||
|
AVCodecContext *avctx,
|
||||||
|
const uint8_t **poutbuf, int *poutbuf_size,
|
||||||
|
const uint8_t *buf, int buf_size)
|
||||||
|
{
|
||||||
|
RV34ParseContext *pc = s->priv_data;
|
||||||
|
int type, pts, hdr;
|
||||||
|
|
||||||
|
if (buf_size < 13 + *buf * 8) {
|
||||||
|
*poutbuf = buf;
|
||||||
|
*poutbuf_size = buf_size;
|
||||||
|
return buf_size;
|
||||||
|
}
|
||||||
|
|
||||||
|
hdr = AV_RB32(buf + 9 + *buf * 8);
|
||||||
|
if (avctx->codec_id == CODEC_ID_RV30) {
|
||||||
|
type = (hdr >> 27) & 3;
|
||||||
|
pts = (hdr >> 7) & 0x1FFF;
|
||||||
|
} else {
|
||||||
|
type = (hdr >> 29) & 3;
|
||||||
|
pts = (hdr >> 6) & 0x1FFF;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (type != 3 && s->pts != AV_NOPTS_VALUE) {
|
||||||
|
pc->key_dts = s->pts;
|
||||||
|
pc->key_pts = pts;
|
||||||
|
} else {
|
||||||
|
if (type != 3)
|
||||||
|
s->pts = pc->key_dts + ((pts - pc->key_pts) & 0x1FFF);
|
||||||
|
else
|
||||||
|
s->pts = pc->key_dts - ((pc->key_pts - pts) & 0x1FFF);
|
||||||
|
}
|
||||||
|
s->pict_type = rv_to_av_frame_type[type];
|
||||||
|
|
||||||
|
*poutbuf = buf;
|
||||||
|
*poutbuf_size = buf_size;
|
||||||
|
return buf_size;
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_RV30_PARSER
|
||||||
|
AVCodecParser ff_rv30_parser = {
|
||||||
|
{ CODEC_ID_RV30 },
|
||||||
|
sizeof(RV34ParseContext),
|
||||||
|
NULL,
|
||||||
|
rv34_parse,
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_RV40_PARSER
|
||||||
|
AVCodecParser ff_rv40_parser = {
|
||||||
|
{ CODEC_ID_RV40 },
|
||||||
|
sizeof(RV34ParseContext),
|
||||||
|
NULL,
|
||||||
|
rv34_parse,
|
||||||
|
};
|
||||||
|
#endif
|
||||||
@ -20,6 +20,7 @@
|
|||||||
;******************************************************************************
|
;******************************************************************************
|
||||||
|
|
||||||
%include "x86inc.asm"
|
%include "x86inc.asm"
|
||||||
|
%include "x86util.asm"
|
||||||
|
|
||||||
SECTION_RODATA
|
SECTION_RODATA
|
||||||
pb_f: times 16 db 15
|
pb_f: times 16 db 15
|
||||||
@ -1054,39 +1055,6 @@ emu_edge mmx
|
|||||||
; int32_t max, unsigned int len)
|
; int32_t max, unsigned int len)
|
||||||
;-----------------------------------------------------------------------------
|
;-----------------------------------------------------------------------------
|
||||||
|
|
||||||
%macro PMINSD_MMX 3 ; dst, src, tmp
|
|
||||||
mova %3, %2
|
|
||||||
pcmpgtd %3, %1
|
|
||||||
pxor %1, %2
|
|
||||||
pand %1, %3
|
|
||||||
pxor %1, %2
|
|
||||||
%endmacro
|
|
||||||
|
|
||||||
%macro PMAXSD_MMX 3 ; dst, src, tmp
|
|
||||||
mova %3, %1
|
|
||||||
pcmpgtd %3, %2
|
|
||||||
pand %1, %3
|
|
||||||
pandn %3, %2
|
|
||||||
por %1, %3
|
|
||||||
%endmacro
|
|
||||||
|
|
||||||
%macro CLIPD_MMX 3-4 ; src/dst, min, max, tmp
|
|
||||||
PMINSD_MMX %1, %3, %4
|
|
||||||
PMAXSD_MMX %1, %2, %4
|
|
||||||
%endmacro
|
|
||||||
|
|
||||||
%macro CLIPD_SSE2 3-4 ; src/dst, min (float), max (float), unused
|
|
||||||
cvtdq2ps %1, %1
|
|
||||||
minps %1, %3
|
|
||||||
maxps %1, %2
|
|
||||||
cvtps2dq %1, %1
|
|
||||||
%endmacro
|
|
||||||
|
|
||||||
%macro CLIPD_SSE41 3-4 ; src/dst, min, max, unused
|
|
||||||
pminsd %1, %3
|
|
||||||
pmaxsd %1, %2
|
|
||||||
%endmacro
|
|
||||||
|
|
||||||
%macro SPLATD_MMX 1
|
%macro SPLATD_MMX 1
|
||||||
punpckldq %1, %1
|
punpckldq %1, %1
|
||||||
%endmacro
|
%endmacro
|
||||||
|
|||||||
@ -305,6 +305,7 @@ OBJS-$(CONFIG_WTV_DEMUXER) += wtvdec.o wtv.o asfdec.o asf.o asfcry
|
|||||||
avlanguage.o mpegts.o isom.o riff.o
|
avlanguage.o mpegts.o isom.o riff.o
|
||||||
OBJS-$(CONFIG_WV_DEMUXER) += wv.o apetag.o
|
OBJS-$(CONFIG_WV_DEMUXER) += wv.o apetag.o
|
||||||
OBJS-$(CONFIG_XA_DEMUXER) += xa.o
|
OBJS-$(CONFIG_XA_DEMUXER) += xa.o
|
||||||
|
OBJS-$(CONFIG_XMV_DEMUXER) += xmv.o
|
||||||
OBJS-$(CONFIG_XWMA_DEMUXER) += xwma.o riff.o
|
OBJS-$(CONFIG_XWMA_DEMUXER) += xwma.o riff.o
|
||||||
OBJS-$(CONFIG_YOP_DEMUXER) += yop.o
|
OBJS-$(CONFIG_YOP_DEMUXER) += yop.o
|
||||||
OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg.o
|
OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg.o
|
||||||
|
|||||||
@ -227,6 +227,7 @@ void av_register_all(void)
|
|||||||
REGISTER_DEMUXER (WTV, wtv);
|
REGISTER_DEMUXER (WTV, wtv);
|
||||||
REGISTER_DEMUXER (WV, wv);
|
REGISTER_DEMUXER (WV, wv);
|
||||||
REGISTER_DEMUXER (XA, xa);
|
REGISTER_DEMUXER (XA, xa);
|
||||||
|
REGISTER_DEMUXER (XMV, xmv);
|
||||||
REGISTER_DEMUXER (XWMA, xwma);
|
REGISTER_DEMUXER (XWMA, xwma);
|
||||||
REGISTER_DEMUXER (YOP, yop);
|
REGISTER_DEMUXER (YOP, yop);
|
||||||
REGISTER_MUXDEMUX (YUV4MPEGPIPE, yuv4mpegpipe);
|
REGISTER_MUXDEMUX (YUV4MPEGPIPE, yuv4mpegpipe);
|
||||||
|
|||||||
@ -295,18 +295,19 @@ ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVIOContext *pb,
|
|||||||
goto fail1;
|
goto fail1;
|
||||||
st->codec->width = avio_rb16(pb);
|
st->codec->width = avio_rb16(pb);
|
||||||
st->codec->height = avio_rb16(pb);
|
st->codec->height = avio_rb16(pb);
|
||||||
st->codec->time_base.num= 1;
|
avio_skip(pb, 2); // looks like bits per sample
|
||||||
fps= avio_rb16(pb);
|
avio_skip(pb, 4); // always zero?
|
||||||
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
|
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
|
||||||
avio_rb32(pb);
|
st->need_parsing = AVSTREAM_PARSE_TIMESTAMPS;
|
||||||
avio_skip(pb, 2);
|
fps = avio_rb32(pb);
|
||||||
avio_rb16(pb);
|
|
||||||
|
|
||||||
if ((ret = rm_read_extradata(pb, st->codec, codec_data_size - (avio_tell(pb) - codec_pos))) < 0)
|
if ((ret = rm_read_extradata(pb, st->codec, codec_data_size - (avio_tell(pb) - codec_pos))) < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
// av_log(s, AV_LOG_DEBUG, "fps= %d fps2= %d\n", fps, fps2);
|
av_reduce(&st->codec->time_base.num, &st->codec->time_base.den,
|
||||||
st->codec->time_base.den = fps * st->codec->time_base.num;
|
0x10000, fps, (1 << 30) - 1);
|
||||||
|
st->avg_frame_rate.num = st->codec->time_base.den;
|
||||||
|
st->avg_frame_rate.den = st->codec->time_base.num;
|
||||||
}
|
}
|
||||||
|
|
||||||
skip:
|
skip:
|
||||||
@ -570,7 +571,8 @@ skip:
|
|||||||
|
|
||||||
static int rm_assemble_video_frame(AVFormatContext *s, AVIOContext *pb,
|
static int rm_assemble_video_frame(AVFormatContext *s, AVIOContext *pb,
|
||||||
RMDemuxContext *rm, RMStream *vst,
|
RMDemuxContext *rm, RMStream *vst,
|
||||||
AVPacket *pkt, int len, int *pseq)
|
AVPacket *pkt, int len, int *pseq,
|
||||||
|
int64_t *timestamp)
|
||||||
{
|
{
|
||||||
int hdr, seq, pic_num, len2, pos;
|
int hdr, seq, pic_num, len2, pos;
|
||||||
int type;
|
int type;
|
||||||
@ -590,8 +592,10 @@ static int rm_assemble_video_frame(AVFormatContext *s, AVIOContext *pb,
|
|||||||
return -1;
|
return -1;
|
||||||
rm->remaining_len = len;
|
rm->remaining_len = len;
|
||||||
if(type&1){ // frame, not slice
|
if(type&1){ // frame, not slice
|
||||||
if(type == 3) // frame as a part of packet
|
if(type == 3){ // frame as a part of packet
|
||||||
len= len2;
|
len= len2;
|
||||||
|
*timestamp = pos;
|
||||||
|
}
|
||||||
if(rm->remaining_len < len)
|
if(rm->remaining_len < len)
|
||||||
return -1;
|
return -1;
|
||||||
rm->remaining_len -= len;
|
rm->remaining_len -= len;
|
||||||
@ -699,7 +703,7 @@ ff_rm_parse_packet (AVFormatContext *s, AVIOContext *pb,
|
|||||||
|
|
||||||
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
|
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
|
||||||
rm->current_stream= st->id;
|
rm->current_stream= st->id;
|
||||||
if(rm_assemble_video_frame(s, pb, rm, ast, pkt, len, seq))
|
if(rm_assemble_video_frame(s, pb, rm, ast, pkt, len, seq, ×tamp))
|
||||||
return -1; //got partial frame
|
return -1; //got partial frame
|
||||||
} else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
|
} else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
|
||||||
if ((st->codec->codec_id == CODEC_ID_RA_288) ||
|
if ((st->codec->codec_id == CODEC_ID_RA_288) ||
|
||||||
@ -774,7 +778,7 @@ ff_rm_parse_packet (AVFormatContext *s, AVIOContext *pb,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
pkt->pts= timestamp;
|
pkt->pts = timestamp;
|
||||||
if (flags & 2)
|
if (flags & 2)
|
||||||
pkt->flags |= AV_PKT_FLAG_KEY;
|
pkt->flags |= AV_PKT_FLAG_KEY;
|
||||||
|
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
#include "libavutil/avutil.h"
|
#include "libavutil/avutil.h"
|
||||||
|
|
||||||
#define LIBAVFORMAT_VERSION_MAJOR 53
|
#define LIBAVFORMAT_VERSION_MAJOR 53
|
||||||
#define LIBAVFORMAT_VERSION_MINOR 7
|
#define LIBAVFORMAT_VERSION_MINOR 8
|
||||||
#define LIBAVFORMAT_VERSION_MICRO 0
|
#define LIBAVFORMAT_VERSION_MICRO 0
|
||||||
|
|
||||||
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
|
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
|
||||||
|
|||||||
576
libavformat/xmv.c
Normal file
576
libavformat/xmv.c
Normal file
@ -0,0 +1,576 @@
|
|||||||
|
/*
|
||||||
|
* Microsoft XMV demuxer
|
||||||
|
* Copyright (c) 2011 Sven Hesse <drmccoy@drmccoy.de>
|
||||||
|
* Copyright (c) 2011 Matthew Hoops <clone2727@gmail.com>
|
||||||
|
*
|
||||||
|
* This file is part of Libav.
|
||||||
|
*
|
||||||
|
* Libav is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 2.1 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Libav is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
|
* License along with Libav; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @file
|
||||||
|
* Microsoft XMV demuxer
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
#include "libavutil/intreadwrite.h"
|
||||||
|
|
||||||
|
#include "avformat.h"
|
||||||
|
#include "riff.h"
|
||||||
|
|
||||||
|
#define XMV_MIN_HEADER_SIZE 36
|
||||||
|
|
||||||
|
#define XMV_AUDIO_ADPCM51_FRONTLEFTRIGHT 1
|
||||||
|
#define XMV_AUDIO_ADPCM51_FRONTCENTERLOW 2
|
||||||
|
#define XMV_AUDIO_ADPCM51_REARLEFTRIGHT 4
|
||||||
|
|
||||||
|
#define XMV_AUDIO_ADPCM51 (XMV_AUDIO_ADPCM51_FRONTLEFTRIGHT | \
|
||||||
|
XMV_AUDIO_ADPCM51_FRONTCENTERLOW | \
|
||||||
|
XMV_AUDIO_ADPCM51_REARLEFTRIGHT)
|
||||||
|
|
||||||
|
typedef struct XMVAudioTrack {
|
||||||
|
uint16_t compression;
|
||||||
|
uint16_t channels;
|
||||||
|
uint32_t sample_rate;
|
||||||
|
uint16_t bits_per_sample;
|
||||||
|
uint32_t bit_rate;
|
||||||
|
uint16_t flags;
|
||||||
|
uint16_t block_align;
|
||||||
|
uint16_t block_samples;
|
||||||
|
|
||||||
|
enum CodecID codec_id;
|
||||||
|
} XMVAudioTrack;
|
||||||
|
|
||||||
|
typedef struct XMVVideoPacket {
|
||||||
|
/* The decoder stream index for this video packet. */
|
||||||
|
int stream_index;
|
||||||
|
|
||||||
|
uint32_t data_size;
|
||||||
|
uint32_t data_offset;
|
||||||
|
|
||||||
|
uint32_t current_frame;
|
||||||
|
uint32_t frame_count;
|
||||||
|
|
||||||
|
/* Does the video packet contain extra data? */
|
||||||
|
int has_extradata;
|
||||||
|
|
||||||
|
/* Extra data */
|
||||||
|
uint8_t extradata[4];
|
||||||
|
|
||||||
|
int64_t last_pts;
|
||||||
|
int64_t pts;
|
||||||
|
} XMVVideoPacket;
|
||||||
|
|
||||||
|
typedef struct XMVAudioPacket {
|
||||||
|
/* The decoder stream index for this audio packet. */
|
||||||
|
int stream_index;
|
||||||
|
|
||||||
|
/* The audio track this packet encodes. */
|
||||||
|
XMVAudioTrack *track;
|
||||||
|
|
||||||
|
uint32_t data_size;
|
||||||
|
uint32_t data_offset;
|
||||||
|
|
||||||
|
uint32_t frame_size;
|
||||||
|
|
||||||
|
uint32_t block_count;
|
||||||
|
} XMVAudioPacket;
|
||||||
|
|
||||||
|
typedef struct XMVDemuxContext {
|
||||||
|
uint16_t audio_track_count;
|
||||||
|
|
||||||
|
XMVAudioTrack *audio_tracks;
|
||||||
|
|
||||||
|
uint32_t this_packet_size;
|
||||||
|
uint32_t next_packet_size;
|
||||||
|
|
||||||
|
uint32_t this_packet_offset;
|
||||||
|
uint32_t next_packet_offset;
|
||||||
|
|
||||||
|
uint16_t current_stream;
|
||||||
|
uint16_t stream_count;
|
||||||
|
|
||||||
|
XMVVideoPacket video;
|
||||||
|
XMVAudioPacket *audio;
|
||||||
|
} XMVDemuxContext;
|
||||||
|
|
||||||
|
static int xmv_probe(AVProbeData *p)
|
||||||
|
{
|
||||||
|
uint32_t file_version;
|
||||||
|
|
||||||
|
if (p->buf_size < XMV_MIN_HEADER_SIZE)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
file_version = AV_RL32(p->buf + 16);
|
||||||
|
if ((file_version == 0) || (file_version > 4))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if (!memcmp(p->buf + 12, "xobX", 4))
|
||||||
|
return AVPROBE_SCORE_MAX;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int xmv_read_header(AVFormatContext *s,
|
||||||
|
AVFormatParameters *ap)
|
||||||
|
{
|
||||||
|
XMVDemuxContext *xmv = s->priv_data;
|
||||||
|
AVIOContext *pb = s->pb;
|
||||||
|
AVStream *vst = NULL;
|
||||||
|
|
||||||
|
uint32_t file_version;
|
||||||
|
uint32_t this_packet_size;
|
||||||
|
uint16_t audio_track;
|
||||||
|
|
||||||
|
avio_skip(pb, 4); /* Next packet size */
|
||||||
|
|
||||||
|
this_packet_size = avio_rl32(pb);
|
||||||
|
|
||||||
|
avio_skip(pb, 4); /* Max packet size */
|
||||||
|
avio_skip(pb, 4); /* "xobX" */
|
||||||
|
|
||||||
|
file_version = avio_rl32(pb);
|
||||||
|
if ((file_version != 4) && (file_version != 2))
|
||||||
|
av_log_ask_for_sample(s, "Found uncommon version %d\n", file_version);
|
||||||
|
|
||||||
|
|
||||||
|
/* Video track */
|
||||||
|
|
||||||
|
vst = av_new_stream(s, 0);
|
||||||
|
if (!vst)
|
||||||
|
return AVERROR(ENOMEM);
|
||||||
|
|
||||||
|
av_set_pts_info(vst, 32, 1, 1000);
|
||||||
|
|
||||||
|
vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
|
||||||
|
vst->codec->codec_id = CODEC_ID_WMV2;
|
||||||
|
vst->codec->codec_tag = MKBETAG('W', 'M', 'V', '2');
|
||||||
|
vst->codec->width = avio_rl32(pb);
|
||||||
|
vst->codec->height = avio_rl32(pb);
|
||||||
|
|
||||||
|
vst->duration = avio_rl32(pb);
|
||||||
|
|
||||||
|
xmv->video.stream_index = vst->index;
|
||||||
|
|
||||||
|
/* Audio tracks */
|
||||||
|
|
||||||
|
xmv->audio_track_count = avio_rl16(pb);
|
||||||
|
|
||||||
|
avio_skip(pb, 2); /* Unknown (padding?) */
|
||||||
|
|
||||||
|
xmv->audio_tracks = av_malloc(xmv->audio_track_count * sizeof(XMVAudioTrack));
|
||||||
|
if (!xmv->audio_tracks)
|
||||||
|
return AVERROR(ENOMEM);
|
||||||
|
|
||||||
|
xmv->audio = av_malloc(xmv->audio_track_count * sizeof(XMVAudioPacket));
|
||||||
|
if (!xmv->audio)
|
||||||
|
return AVERROR(ENOMEM);
|
||||||
|
|
||||||
|
for (audio_track = 0; audio_track < xmv->audio_track_count; audio_track++) {
|
||||||
|
XMVAudioTrack *track = &xmv->audio_tracks[audio_track];
|
||||||
|
XMVAudioPacket *packet = &xmv->audio [audio_track];
|
||||||
|
AVStream *ast = NULL;
|
||||||
|
|
||||||
|
track->compression = avio_rl16(pb);
|
||||||
|
track->channels = avio_rl16(pb);
|
||||||
|
track->sample_rate = avio_rl32(pb);
|
||||||
|
track->bits_per_sample = avio_rl16(pb);
|
||||||
|
track->flags = avio_rl16(pb);
|
||||||
|
|
||||||
|
track->bit_rate = track->bits_per_sample *
|
||||||
|
track->sample_rate *
|
||||||
|
track->channels;
|
||||||
|
track->block_align = 36 * track->channels;
|
||||||
|
track->block_samples = 64;
|
||||||
|
track->codec_id = ff_wav_codec_get_id(track->compression,
|
||||||
|
track->bits_per_sample);
|
||||||
|
|
||||||
|
packet->track = track;
|
||||||
|
packet->stream_index = -1;
|
||||||
|
|
||||||
|
packet->frame_size = 0;
|
||||||
|
packet->block_count = 0;
|
||||||
|
|
||||||
|
/* TODO: ADPCM'd 5.1 sound is encoded in three separate streams.
|
||||||
|
* Those need to be interleaved to a proper 5.1 stream. */
|
||||||
|
if (track->flags & XMV_AUDIO_ADPCM51)
|
||||||
|
av_log(s, AV_LOG_WARNING, "Unsupported 5.1 ADPCM audio stream "
|
||||||
|
"(0x%04X)\n", track->flags);
|
||||||
|
|
||||||
|
ast = av_new_stream(s, audio_track);
|
||||||
|
if (!ast)
|
||||||
|
return AVERROR(ENOMEM);
|
||||||
|
|
||||||
|
ast->codec->codec_type = AVMEDIA_TYPE_AUDIO;
|
||||||
|
ast->codec->codec_id = track->codec_id;
|
||||||
|
ast->codec->codec_tag = track->compression;
|
||||||
|
ast->codec->channels = track->channels;
|
||||||
|
ast->codec->sample_rate = track->sample_rate;
|
||||||
|
ast->codec->bits_per_coded_sample = track->bits_per_sample;
|
||||||
|
ast->codec->bit_rate = track->bit_rate;
|
||||||
|
ast->codec->block_align = 36 * track->channels;
|
||||||
|
|
||||||
|
av_set_pts_info(ast, 32, track->block_samples, track->sample_rate);
|
||||||
|
|
||||||
|
packet->stream_index = ast->index;
|
||||||
|
|
||||||
|
ast->duration = vst->duration;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/** Initialize the packet context */
|
||||||
|
|
||||||
|
xmv->next_packet_offset = avio_tell(pb);
|
||||||
|
|
||||||
|
xmv->next_packet_size = this_packet_size - xmv->next_packet_offset;
|
||||||
|
xmv->this_packet_size = 0;
|
||||||
|
|
||||||
|
xmv->video.current_frame = 0;
|
||||||
|
xmv->video.frame_count = 0;
|
||||||
|
xmv->video.pts = 0;
|
||||||
|
xmv->video.last_pts = 0;
|
||||||
|
|
||||||
|
xmv->current_stream = 0;
|
||||||
|
xmv->stream_count = xmv->audio_track_count + 1;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void xmv_read_extradata(uint8_t *extradata, AVIOContext *pb)
|
||||||
|
{
|
||||||
|
/* Read the XMV extradata */
|
||||||
|
|
||||||
|
uint32_t data = avio_rl32(pb);
|
||||||
|
|
||||||
|
int mspel_bit = !!(data & 0x01);
|
||||||
|
int loop_filter = !!(data & 0x02);
|
||||||
|
int abt_flag = !!(data & 0x04);
|
||||||
|
int j_type_bit = !!(data & 0x08);
|
||||||
|
int top_left_mv_flag = !!(data & 0x10);
|
||||||
|
int per_mb_rl_bit = !!(data & 0x20);
|
||||||
|
int slice_count = (data >> 6) & 7;
|
||||||
|
|
||||||
|
/* Write it back as standard WMV2 extradata */
|
||||||
|
|
||||||
|
data = 0;
|
||||||
|
|
||||||
|
data |= mspel_bit << 15;
|
||||||
|
data |= loop_filter << 14;
|
||||||
|
data |= abt_flag << 13;
|
||||||
|
data |= j_type_bit << 12;
|
||||||
|
data |= top_left_mv_flag << 11;
|
||||||
|
data |= per_mb_rl_bit << 10;
|
||||||
|
data |= slice_count << 7;
|
||||||
|
|
||||||
|
AV_WB32(extradata, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int xmv_process_packet_header(AVFormatContext *s)
|
||||||
|
{
|
||||||
|
XMVDemuxContext *xmv = s->priv_data;
|
||||||
|
AVIOContext *pb = s->pb;
|
||||||
|
|
||||||
|
uint8_t data[8];
|
||||||
|
uint16_t audio_track;
|
||||||
|
uint32_t data_offset;
|
||||||
|
|
||||||
|
/* Next packet size */
|
||||||
|
xmv->next_packet_size = avio_rl32(pb);
|
||||||
|
|
||||||
|
/* Packet video header */
|
||||||
|
|
||||||
|
if (avio_read(pb, data, 8) != 8)
|
||||||
|
return AVERROR(EIO);
|
||||||
|
|
||||||
|
xmv->video.data_size = AV_RL32(data) & 0x007FFFFF;
|
||||||
|
|
||||||
|
xmv->video.current_frame = 0;
|
||||||
|
xmv->video.frame_count = (AV_RL32(data) >> 23) & 0xFF;
|
||||||
|
|
||||||
|
xmv->video.has_extradata = (data[3] & 0x80) != 0;
|
||||||
|
|
||||||
|
/* Adding the audio data sizes and the video data size keeps you 4 bytes
|
||||||
|
* short for every audio track. But as playing around with XMV files with
|
||||||
|
* ADPCM audio showed, taking the extra 4 bytes from the audio data gives
|
||||||
|
* you either completely distorted audio or click (when skipping the
|
||||||
|
* remaining 68 bytes of the ADPCM block). Substracting 4 bytes for every
|
||||||
|
* audio track from the video data works at least for the audio. Probably
|
||||||
|
* some alignment thing?
|
||||||
|
* The video data has (always?) lots of padding, so it should work out...
|
||||||
|
*/
|
||||||
|
xmv->video.data_size -= xmv->audio_track_count * 4;
|
||||||
|
|
||||||
|
xmv->current_stream = 0;
|
||||||
|
if (!xmv->video.frame_count) {
|
||||||
|
xmv->video.frame_count = 1;
|
||||||
|
xmv->current_stream = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Packet audio header */
|
||||||
|
|
||||||
|
for (audio_track = 0; audio_track < xmv->audio_track_count; audio_track++) {
|
||||||
|
XMVAudioPacket *packet = &xmv->audio[audio_track];
|
||||||
|
|
||||||
|
if (avio_read(pb, data, 4) != 4)
|
||||||
|
return AVERROR(EIO);
|
||||||
|
|
||||||
|
packet->data_size = AV_RL32(data) & 0x007FFFFF;
|
||||||
|
if ((packet->data_size == 0) && (audio_track != 0))
|
||||||
|
/* This happens when I create an XMV with several identical audio
|
||||||
|
* streams. From the size calculations, duplicating the previous
|
||||||
|
* stream's size works out, but the track data itself is silent.
|
||||||
|
* Maybe this should also redirect the offset to the previous track?
|
||||||
|
*/
|
||||||
|
packet->data_size = xmv->audio[audio_track - 1].data_size;
|
||||||
|
|
||||||
|
/** Carve up the audio data in frame_count slices */
|
||||||
|
packet->frame_size = packet->data_size / xmv->video.frame_count;
|
||||||
|
packet->frame_size -= packet->frame_size % packet->track->block_align;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Packet data offsets */
|
||||||
|
|
||||||
|
data_offset = avio_tell(pb);
|
||||||
|
|
||||||
|
xmv->video.data_offset = data_offset;
|
||||||
|
data_offset += xmv->video.data_size;
|
||||||
|
|
||||||
|
for (audio_track = 0; audio_track < xmv->audio_track_count; audio_track++) {
|
||||||
|
xmv->audio[audio_track].data_offset = data_offset;
|
||||||
|
data_offset += xmv->audio[audio_track].data_size;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Video frames header */
|
||||||
|
|
||||||
|
/* Read new video extra data */
|
||||||
|
if (xmv->video.data_size > 0) {
|
||||||
|
if (xmv->video.has_extradata) {
|
||||||
|
xmv_read_extradata(xmv->video.extradata, pb);
|
||||||
|
|
||||||
|
xmv->video.data_size -= 4;
|
||||||
|
xmv->video.data_offset += 4;
|
||||||
|
|
||||||
|
if (xmv->video.stream_index >= 0) {
|
||||||
|
AVStream *vst = s->streams[xmv->video.stream_index];
|
||||||
|
|
||||||
|
assert(xmv->video.stream_index < s->nb_streams);
|
||||||
|
|
||||||
|
if (vst->codec->extradata_size < 4) {
|
||||||
|
av_free(vst->codec->extradata);
|
||||||
|
|
||||||
|
vst->codec->extradata =
|
||||||
|
av_malloc(4 + FF_INPUT_BUFFER_PADDING_SIZE);
|
||||||
|
vst->codec->extradata_size = 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
memcpy(vst->codec->extradata, xmv->video.extradata, 4);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int xmv_fetch_new_packet(AVFormatContext *s)
|
||||||
|
{
|
||||||
|
XMVDemuxContext *xmv = s->priv_data;
|
||||||
|
AVIOContext *pb = s->pb;
|
||||||
|
int result;
|
||||||
|
|
||||||
|
/* Seek to it */
|
||||||
|
xmv->this_packet_offset = xmv->next_packet_offset;
|
||||||
|
if (avio_seek(pb, xmv->this_packet_offset, SEEK_SET) != xmv->this_packet_offset)
|
||||||
|
return AVERROR(EIO);
|
||||||
|
|
||||||
|
/* Update the size */
|
||||||
|
xmv->this_packet_size = xmv->next_packet_size;
|
||||||
|
if (xmv->this_packet_size < (12 + xmv->audio_track_count * 4))
|
||||||
|
return AVERROR(EIO);
|
||||||
|
|
||||||
|
/* Process the header */
|
||||||
|
result = xmv_process_packet_header(s);
|
||||||
|
if (result)
|
||||||
|
return result;
|
||||||
|
|
||||||
|
/* Update the offset */
|
||||||
|
xmv->next_packet_offset = xmv->this_packet_offset + xmv->this_packet_size;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int xmv_fetch_audio_packet(AVFormatContext *s,
|
||||||
|
AVPacket *pkt, uint32_t stream)
|
||||||
|
{
|
||||||
|
XMVDemuxContext *xmv = s->priv_data;
|
||||||
|
AVIOContext *pb = s->pb;
|
||||||
|
XMVAudioPacket *audio = &xmv->audio[stream];
|
||||||
|
|
||||||
|
uint32_t data_size;
|
||||||
|
uint32_t block_count;
|
||||||
|
int result;
|
||||||
|
|
||||||
|
/* Seek to it */
|
||||||
|
if (avio_seek(pb, audio->data_offset, SEEK_SET) != audio->data_offset)
|
||||||
|
return AVERROR(EIO);
|
||||||
|
|
||||||
|
if ((xmv->video.current_frame + 1) < xmv->video.frame_count)
|
||||||
|
/* Not the last frame, get at most frame_size bytes. */
|
||||||
|
data_size = FFMIN(audio->frame_size, audio->data_size);
|
||||||
|
else
|
||||||
|
/* Last frame, get the rest. */
|
||||||
|
data_size = audio->data_size;
|
||||||
|
|
||||||
|
/* Read the packet */
|
||||||
|
result = av_get_packet(pb, pkt, data_size);
|
||||||
|
if (result <= 0)
|
||||||
|
return result;
|
||||||
|
|
||||||
|
pkt->stream_index = audio->stream_index;
|
||||||
|
|
||||||
|
/* Calculate the PTS */
|
||||||
|
|
||||||
|
block_count = data_size / audio->track->block_align;
|
||||||
|
|
||||||
|
pkt->duration = block_count;
|
||||||
|
pkt->pts = audio->block_count;
|
||||||
|
pkt->dts = AV_NOPTS_VALUE;
|
||||||
|
|
||||||
|
audio->block_count += block_count;
|
||||||
|
|
||||||
|
/* Advance offset */
|
||||||
|
audio->data_size -= data_size;
|
||||||
|
audio->data_offset += data_size;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int xmv_fetch_video_packet(AVFormatContext *s,
|
||||||
|
AVPacket *pkt)
|
||||||
|
{
|
||||||
|
XMVDemuxContext *xmv = s->priv_data;
|
||||||
|
AVIOContext *pb = s->pb;
|
||||||
|
XMVVideoPacket *video = &xmv->video;
|
||||||
|
|
||||||
|
int result;
|
||||||
|
uint32_t frame_header;
|
||||||
|
uint32_t frame_size, frame_timestamp;
|
||||||
|
uint32_t i;
|
||||||
|
|
||||||
|
/* Seek to it */
|
||||||
|
if (avio_seek(pb, video->data_offset, SEEK_SET) != video->data_offset)
|
||||||
|
return AVERROR(EIO);
|
||||||
|
|
||||||
|
/* Read the frame header */
|
||||||
|
frame_header = avio_rl32(pb);
|
||||||
|
|
||||||
|
frame_size = (frame_header & 0x1FFFF) * 4 + 4;
|
||||||
|
frame_timestamp = (frame_header >> 17);
|
||||||
|
|
||||||
|
if ((frame_size + 4) > video->data_size)
|
||||||
|
return AVERROR(EIO);
|
||||||
|
|
||||||
|
/* Create the packet */
|
||||||
|
result = av_new_packet(pkt, frame_size);
|
||||||
|
if (result)
|
||||||
|
return result;
|
||||||
|
|
||||||
|
/* Contrary to normal WMV2 video, the bit stream in XMV's
|
||||||
|
* WMV2 is little-endian.
|
||||||
|
* TODO: This manual swap is of course suboptimal.
|
||||||
|
*/
|
||||||
|
for (i = 0; i < frame_size; i += 4)
|
||||||
|
AV_WB32(pkt->data + i, avio_rl32(pb));
|
||||||
|
|
||||||
|
pkt->stream_index = video->stream_index;
|
||||||
|
|
||||||
|
/* Calculate the PTS */
|
||||||
|
|
||||||
|
video->last_pts = frame_timestamp + video->pts;
|
||||||
|
|
||||||
|
pkt->duration = 0;
|
||||||
|
pkt->pts = video->last_pts;
|
||||||
|
pkt->dts = AV_NOPTS_VALUE;
|
||||||
|
|
||||||
|
video->pts += frame_timestamp;
|
||||||
|
|
||||||
|
/* Keyframe? */
|
||||||
|
pkt->flags = (pkt->data[0] & 0x80) ? 0 : AV_PKT_FLAG_KEY;
|
||||||
|
|
||||||
|
/* Advance offset */
|
||||||
|
video->data_size -= frame_size + 4;
|
||||||
|
video->data_offset += frame_size + 4;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int xmv_read_packet(AVFormatContext *s,
|
||||||
|
AVPacket *pkt)
|
||||||
|
{
|
||||||
|
XMVDemuxContext *xmv = s->priv_data;
|
||||||
|
int result;
|
||||||
|
|
||||||
|
if (xmv->video.current_frame == xmv->video.frame_count) {
|
||||||
|
/* No frames left in this packet, so we fetch a new one */
|
||||||
|
|
||||||
|
result = xmv_fetch_new_packet(s);
|
||||||
|
if (result)
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (xmv->current_stream == 0) {
|
||||||
|
/* Fetch a video frame */
|
||||||
|
|
||||||
|
result = xmv_fetch_video_packet(s, pkt);
|
||||||
|
if (result)
|
||||||
|
return result;
|
||||||
|
|
||||||
|
} else {
|
||||||
|
/* Fetch an audio frame */
|
||||||
|
|
||||||
|
result = xmv_fetch_audio_packet(s, pkt, xmv->current_stream - 1);
|
||||||
|
if (result)
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Increase our counters */
|
||||||
|
if (++xmv->current_stream >= xmv->stream_count) {
|
||||||
|
xmv->current_stream = 0;
|
||||||
|
xmv->video.current_frame += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int xmv_read_close(AVFormatContext *s)
|
||||||
|
{
|
||||||
|
XMVDemuxContext *xmv = s->priv_data;
|
||||||
|
|
||||||
|
av_free(xmv->audio);
|
||||||
|
av_free(xmv->audio_tracks);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
AVInputFormat ff_xmv_demuxer = {
|
||||||
|
.name = "xmv",
|
||||||
|
.long_name = NULL_IF_CONFIG_SMALL("Microsoft XMV"),
|
||||||
|
.priv_data_size = sizeof(XMVDemuxContext),
|
||||||
|
.read_probe = xmv_probe,
|
||||||
|
.read_header = xmv_read_header,
|
||||||
|
.read_packet = xmv_read_packet,
|
||||||
|
.read_close = xmv_read_close,
|
||||||
|
};
|
||||||
@ -540,3 +540,36 @@
|
|||||||
pmaxsw %1, %2
|
pmaxsw %1, %2
|
||||||
pminsw %1, %3
|
pminsw %1, %3
|
||||||
%endmacro
|
%endmacro
|
||||||
|
|
||||||
|
%macro PMINSD_MMX 3 ; dst, src, tmp
|
||||||
|
mova %3, %2
|
||||||
|
pcmpgtd %3, %1
|
||||||
|
pxor %1, %2
|
||||||
|
pand %1, %3
|
||||||
|
pxor %1, %2
|
||||||
|
%endmacro
|
||||||
|
|
||||||
|
%macro PMAXSD_MMX 3 ; dst, src, tmp
|
||||||
|
mova %3, %1
|
||||||
|
pcmpgtd %3, %2
|
||||||
|
pand %1, %3
|
||||||
|
pandn %3, %2
|
||||||
|
por %1, %3
|
||||||
|
%endmacro
|
||||||
|
|
||||||
|
%macro CLIPD_MMX 3-4 ; src/dst, min, max, tmp
|
||||||
|
PMINSD_MMX %1, %3, %4
|
||||||
|
PMAXSD_MMX %1, %2, %4
|
||||||
|
%endmacro
|
||||||
|
|
||||||
|
%macro CLIPD_SSE2 3-4 ; src/dst, min (float), max (float), unused
|
||||||
|
cvtdq2ps %1, %1
|
||||||
|
minps %1, %3
|
||||||
|
maxps %1, %2
|
||||||
|
cvtps2dq %1, %1
|
||||||
|
%endmacro
|
||||||
|
|
||||||
|
%macro CLIPD_SSE41 3-4 ; src/dst, min, max, unused
|
||||||
|
pminsd %1, %3
|
||||||
|
pmaxsd %1, %2
|
||||||
|
%endmacro
|
||||||
|
|||||||
@ -400,7 +400,7 @@ void ff_sws_init_swScale_altivec(SwsContext *c)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
if (c->srcBpc == 8 && c->dstBpc <= 10) {
|
if (c->srcBpc == 8 && c->dstBpc <= 10) {
|
||||||
c->hScale = hScale_altivec_real;
|
c->hyScale = c->hcScale = hScale_altivec_real;
|
||||||
}
|
}
|
||||||
if (!is16BPS(dstFormat) && !is9_OR_10BPS(dstFormat) &&
|
if (!is16BPS(dstFormat) && !is9_OR_10BPS(dstFormat) &&
|
||||||
dstFormat != PIX_FMT_NV12 && dstFormat != PIX_FMT_NV21 &&
|
dstFormat != PIX_FMT_NV12 && dstFormat != PIX_FMT_NV21 &&
|
||||||
|
|||||||
@ -2212,7 +2212,7 @@ static av_always_inline void hyscale(SwsContext *c, int16_t *dst, int dstWidth,
|
|||||||
int shift= isAnyRGB(c->srcFormat) || c->srcFormat==PIX_FMT_PAL8 ? 13 : av_pix_fmt_descriptors[c->srcFormat].comp[0].depth_minus1;
|
int shift= isAnyRGB(c->srcFormat) || c->srcFormat==PIX_FMT_PAL8 ? 13 : av_pix_fmt_descriptors[c->srcFormat].comp[0].depth_minus1;
|
||||||
c->hScale16(dst, dstWidth, (const uint16_t*)src, srcW, xInc, hLumFilter, hLumFilterPos, hLumFilterSize, shift);
|
c->hScale16(dst, dstWidth, (const uint16_t*)src, srcW, xInc, hLumFilter, hLumFilterPos, hLumFilterSize, shift);
|
||||||
} else if (!c->hyscale_fast) {
|
} else if (!c->hyscale_fast) {
|
||||||
c->hScale(c, dst, dstWidth, src, hLumFilter, hLumFilterPos, hLumFilterSize);
|
c->hyScale(c, dst, dstWidth, src, hLumFilter, hLumFilterPos, hLumFilterSize);
|
||||||
} else { // fast bilinear upscale / crap downscale
|
} else { // fast bilinear upscale / crap downscale
|
||||||
c->hyscale_fast(c, dst, dstWidth, src, srcW, xInc);
|
c->hyscale_fast(c, dst, dstWidth, src, srcW, xInc);
|
||||||
}
|
}
|
||||||
@ -2258,8 +2258,8 @@ static av_always_inline void hcscale(SwsContext *c, int16_t *dst1, int16_t *dst2
|
|||||||
c->hScale16(dst1, dstWidth, (const uint16_t*)src1, srcW, xInc, hChrFilter, hChrFilterPos, hChrFilterSize, shift);
|
c->hScale16(dst1, dstWidth, (const uint16_t*)src1, srcW, xInc, hChrFilter, hChrFilterPos, hChrFilterSize, shift);
|
||||||
c->hScale16(dst2, dstWidth, (const uint16_t*)src2, srcW, xInc, hChrFilter, hChrFilterPos, hChrFilterSize, shift);
|
c->hScale16(dst2, dstWidth, (const uint16_t*)src2, srcW, xInc, hChrFilter, hChrFilterPos, hChrFilterSize, shift);
|
||||||
} else if (!c->hcscale_fast) {
|
} else if (!c->hcscale_fast) {
|
||||||
c->hScale(c, dst1, dstWidth, src1, hChrFilter, hChrFilterPos, hChrFilterSize);
|
c->hcScale(c, dst1, dstWidth, src1, hChrFilter, hChrFilterPos, hChrFilterSize);
|
||||||
c->hScale(c, dst2, dstWidth, src2, hChrFilter, hChrFilterPos, hChrFilterSize);
|
c->hcScale(c, dst2, dstWidth, src2, hChrFilter, hChrFilterPos, hChrFilterSize);
|
||||||
} else { // fast bilinear upscale / crap downscale
|
} else { // fast bilinear upscale / crap downscale
|
||||||
c->hcscale_fast(c, dst1, dst2, dstWidth, src1, src2, srcW, xInc);
|
c->hcscale_fast(c, dst1, dst2, dstWidth, src1, src2, srcW, xInc);
|
||||||
}
|
}
|
||||||
@ -2929,16 +2929,16 @@ static av_cold void sws_init_swScale_c(SwsContext *c)
|
|||||||
|
|
||||||
if (c->srcBpc == 8) {
|
if (c->srcBpc == 8) {
|
||||||
if (c->dstBpc <= 10) {
|
if (c->dstBpc <= 10) {
|
||||||
c->hScale = hScale8To15_c;
|
c->hyScale = c->hcScale = hScale8To15_c;
|
||||||
if (c->flags & SWS_FAST_BILINEAR) {
|
if (c->flags & SWS_FAST_BILINEAR) {
|
||||||
c->hyscale_fast = hyscale_fast_c;
|
c->hyscale_fast = hyscale_fast_c;
|
||||||
c->hcscale_fast = hcscale_fast_c;
|
c->hcscale_fast = hcscale_fast_c;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
c->hScale = hScale8To19_c;
|
c->hyScale = c->hcScale = hScale8To19_c;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
c->hScale = c->dstBpc > 10 ? hScale16To19_c : hScale16To15_c;
|
c->hyScale = c->hcScale = c->dstBpc > 10 ? hScale16To19_c : hScale16To15_c;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat)) {
|
if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat)) {
|
||||||
|
|||||||
@ -483,9 +483,14 @@ typedef struct SwsContext {
|
|||||||
* (and input coefficients thus padded with zeroes)
|
* (and input coefficients thus padded with zeroes)
|
||||||
* to simplify creating SIMD code.
|
* to simplify creating SIMD code.
|
||||||
*/
|
*/
|
||||||
void (*hScale)(struct SwsContext *c, int16_t *dst, int dstW, const uint8_t *src,
|
/** @{ */
|
||||||
|
void (*hyScale)(struct SwsContext *c, int16_t *dst, int dstW, const uint8_t *src,
|
||||||
const int16_t *filter, const int16_t *filterPos,
|
const int16_t *filter, const int16_t *filterPos,
|
||||||
int filterSize);
|
int filterSize);
|
||||||
|
void (*hcScale)(struct SwsContext *c, int16_t *dst, int dstW, const uint8_t *src,
|
||||||
|
const int16_t *filter, const int16_t *filterPos,
|
||||||
|
int filterSize);
|
||||||
|
/** @} */
|
||||||
|
|
||||||
void (*hScale16)(int16_t *dst, int dstW, const uint16_t *src, int srcW,
|
void (*hScale16)(int16_t *dst, int dstW, const uint16_t *src, int srcW,
|
||||||
int xInc, const int16_t *filter, const int16_t *filterPos,
|
int xInc, const int16_t *filter, const int16_t *filterPos,
|
||||||
|
|||||||
@ -2474,7 +2474,7 @@ static av_cold void RENAME(sws_init_swScale)(SwsContext *c)
|
|||||||
|
|
||||||
if (c->srcBpc == 8 && c->dstBpc <= 10) {
|
if (c->srcBpc == 8 && c->dstBpc <= 10) {
|
||||||
#if !COMPILE_TEMPLATE_MMX2
|
#if !COMPILE_TEMPLATE_MMX2
|
||||||
c->hScale = RENAME(hScale );
|
c->hyScale = c->hcScale = RENAME(hScale );
|
||||||
#endif /* !COMPILE_TEMPLATE_MMX2 */
|
#endif /* !COMPILE_TEMPLATE_MMX2 */
|
||||||
|
|
||||||
// Use the new MMX scaler if the MMX2 one can't be used (it is faster than the x86 ASM one).
|
// Use the new MMX scaler if the MMX2 one can't be used (it is faster than the x86 ASM one).
|
||||||
|
|||||||
@ -62,4 +62,3 @@
|
|||||||
0, 171000, 921600, 0x5639e670
|
0, 171000, 921600, 0x5639e670
|
||||||
1, 171429, 1000, 0xa491f3ef
|
1, 171429, 1000, 0xa491f3ef
|
||||||
1, 175510, 1000, 0x2c036e18
|
1, 175510, 1000, 0x2c036e18
|
||||||
1, 179592, 1000, 0x52d65e2a
|
|
||||||
|
|||||||
@ -213,4 +213,3 @@
|
|||||||
1, 265680, 768, 0xfd6c7597
|
1, 265680, 768, 0xfd6c7597
|
||||||
0, 267267, 1327, 0x7d15307c
|
0, 267267, 1327, 0x7d15307c
|
||||||
1, 267840, 768, 0x8d766d40
|
1, 267840, 768, 0x8d766d40
|
||||||
0, 270270, 1225, 0x1b5d0f5f
|
|
||||||
|
|||||||
@ -1,121 +1,240 @@
|
|||||||
0, 0, 276480, 0x5f7a0d4f
|
0, 0, 276480, 0x5f7a0d4f
|
||||||
0, 7500, 276480, 0x5f7a0d4f
|
0, 3754, 276480, 0x5f7a0d4f
|
||||||
0, 15000, 276480, 0x5f7a0d4f
|
0, 7507, 276480, 0x5f7a0d4f
|
||||||
0, 22500, 276480, 0x5f7a0d4f
|
0, 11261, 276480, 0x5f7a0d4f
|
||||||
0, 30000, 276480, 0x5f7a0d4f
|
0, 15015, 276480, 0x5f7a0d4f
|
||||||
0, 37500, 276480, 0x5f7a0d4f
|
0, 18769, 276480, 0x5f7a0d4f
|
||||||
0, 45000, 276480, 0x5f7a0d4f
|
0, 22522, 276480, 0x5f7a0d4f
|
||||||
0, 52500, 276480, 0x5f7a0d4f
|
0, 26276, 276480, 0x5f7a0d4f
|
||||||
0, 60000, 276480, 0x5f7a0d4f
|
0, 30030, 276480, 0x5f7a0d4f
|
||||||
0, 67500, 276480, 0x5f7a0d4f
|
0, 33784, 276480, 0x5f7a0d4f
|
||||||
0, 75000, 276480, 0x5f7a0d4f
|
0, 37537, 276480, 0x5f7a0d4f
|
||||||
0, 82500, 276480, 0x5f7a0d4f
|
0, 41291, 276480, 0x5f7a0d4f
|
||||||
0, 90000, 276480, 0x5f7a0d4f
|
0, 45045, 276480, 0x5f7a0d4f
|
||||||
0, 97500, 276480, 0x5f7a0d4f
|
0, 48799, 276480, 0x5f7a0d4f
|
||||||
0, 105000, 276480, 0x5f7a0d4f
|
0, 52552, 276480, 0x5f7a0d4f
|
||||||
0, 112500, 276480, 0x5f7a0d4f
|
0, 56306, 276480, 0x5f7a0d4f
|
||||||
0, 120000, 276480, 0x5f7a0d4f
|
0, 60060, 276480, 0x5f7a0d4f
|
||||||
0, 127500, 276480, 0x5f7a0d4f
|
0, 63814, 276480, 0x5f7a0d4f
|
||||||
0, 135000, 276480, 0x75641594
|
0, 67567, 276480, 0x5f7a0d4f
|
||||||
0, 142500, 276480, 0x32ee3526
|
0, 71321, 276480, 0x5f7a0d4f
|
||||||
0, 150000, 276480, 0x5ce39368
|
0, 75075, 276480, 0x5f7a0d4f
|
||||||
0, 157500, 276480, 0x4ec1e418
|
0, 78829, 276480, 0x5f7a0d4f
|
||||||
0, 165000, 276480, 0x85cbc3b5
|
0, 82582, 276480, 0x5f7a0d4f
|
||||||
0, 172500, 276480, 0x377c7b46
|
0, 86336, 276480, 0x5f7a0d4f
|
||||||
0, 180000, 276480, 0x756a4a2e
|
0, 90090, 276480, 0x5f7a0d4f
|
||||||
0, 187500, 276480, 0xcb379547
|
0, 93844, 276480, 0x5f7a0d4f
|
||||||
0, 195000, 276480, 0x99c085be
|
0, 97597, 276480, 0x5f7a0d4f
|
||||||
0, 202500, 276480, 0xe479ffed
|
0, 101351, 276480, 0x5f7a0d4f
|
||||||
0, 210000, 276480, 0x1e4fae19
|
0, 105105, 276480, 0x5f7a0d4f
|
||||||
0, 217500, 276480, 0x776412ef
|
0, 108859, 276480, 0x5f7a0d4f
|
||||||
0, 225000, 276480, 0x58ce0f38
|
0, 112612, 276480, 0x5f7a0d4f
|
||||||
0, 232500, 276480, 0x5ab69b27
|
0, 116366, 276480, 0x5f7a0d4f
|
||||||
0, 240000, 276480, 0xc3db9706
|
0, 120120, 276480, 0x5f7a0d4f
|
||||||
0, 247500, 276480, 0xc9c57884
|
0, 123874, 276480, 0x75641594
|
||||||
0, 255000, 276480, 0x000b5269
|
0, 127627, 276480, 0x32ee3526
|
||||||
0, 262500, 276480, 0x27ff7a5d
|
0, 131381, 276480, 0xcb53479a
|
||||||
0, 270000, 276480, 0x70647530
|
0, 135135, 276480, 0x7ca9658e
|
||||||
0, 277500, 276480, 0x97612c4b
|
0, 138889, 276480, 0x5ce39368
|
||||||
0, 285000, 276480, 0xdf4e04d7
|
0, 142642, 276480, 0x4ec1e418
|
||||||
0, 292500, 276480, 0xbd98f57c
|
0, 146396, 276480, 0xb3790499
|
||||||
0, 300000, 276480, 0x5163b29b
|
0, 150150, 276480, 0xa9f1506f
|
||||||
0, 307500, 276480, 0x99170e64
|
0, 153904, 276480, 0x85cbc3b5
|
||||||
0, 315000, 276480, 0x8a4e991f
|
0, 157657, 276480, 0x377c7b46
|
||||||
0, 322500, 276480, 0x6a45425f
|
0, 161411, 276480, 0x1a61d8db
|
||||||
0, 330000, 276480, 0x7bf6b1ef
|
0, 165165, 276480, 0xe1de7f0a
|
||||||
0, 337500, 276480, 0x6de1e34b
|
0, 168919, 276480, 0x756a4a2e
|
||||||
0, 345000, 276480, 0xdcaaa99a
|
0, 172672, 276480, 0xcb379547
|
||||||
0, 352500, 276480, 0xd1e98808
|
0, 176426, 276480, 0xbae14484
|
||||||
0, 360000, 276480, 0x6e2d524e
|
0, 180180, 276480, 0x8e12331c
|
||||||
0, 367500, 276480, 0x22c50a3d
|
0, 183934, 276480, 0x99c085be
|
||||||
0, 375000, 276480, 0x62b76407
|
0, 187687, 276480, 0xe479ffed
|
||||||
0, 382500, 276480, 0x51e9b3eb
|
0, 191441, 276480, 0x99c82949
|
||||||
0, 390000, 276480, 0x441f7afd
|
0, 195195, 276480, 0xac7672dd
|
||||||
0, 397500, 276480, 0xfb01efc6
|
0, 198949, 276480, 0x1e4fae19
|
||||||
0, 405000, 276480, 0x294bb441
|
0, 202702, 276480, 0x776412ef
|
||||||
0, 412500, 276480, 0xe04ac45e
|
0, 206456, 276480, 0x7d9b579f
|
||||||
0, 420000, 276480, 0x58f275ea
|
0, 210210, 276480, 0x1cd1ab29
|
||||||
0, 427500, 276480, 0xf0b3b71b
|
0, 213964, 276480, 0x58ce0f38
|
||||||
0, 435000, 276480, 0x674e34e4
|
0, 217717, 276480, 0x5ab69b27
|
||||||
0, 442500, 276480, 0x41dda2d9
|
0, 221471, 276480, 0x0afad610
|
||||||
0, 450000, 276480, 0xf46ba7fb
|
0, 225225, 276480, 0x9eca3f11
|
||||||
0, 457500, 276480, 0x28b54815
|
0, 228979, 276480, 0xc3db9706
|
||||||
0, 465000, 276480, 0xaf2b5d89
|
0, 232732, 276480, 0xc9c57884
|
||||||
0, 472500, 276480, 0x8facba58
|
0, 236486, 276480, 0xd9fbb2cf
|
||||||
0, 480000, 276480, 0x28a63236
|
0, 240240, 276480, 0xdc07f3c9
|
||||||
0, 487500, 276480, 0x1ad43fd7
|
0, 243994, 276480, 0x000b5269
|
||||||
0, 495000, 276480, 0x71507bd2
|
0, 247747, 276480, 0x27ff7a5d
|
||||||
0, 502500, 276480, 0x35626022
|
0, 251501, 276480, 0xd92e2017
|
||||||
0, 510000, 276480, 0x7c1139b3
|
0, 255255, 276480, 0x18d4b27d
|
||||||
0, 517500, 276480, 0x7fd73a99
|
0, 259009, 276480, 0x70647530
|
||||||
0, 525000, 276480, 0xb52e1aa2
|
0, 262762, 276480, 0x97612c4b
|
||||||
0, 532500, 276480, 0xd6f82cae
|
0, 266516, 276480, 0xc9d4ac78
|
||||||
0, 540000, 276480, 0xf88f75d4
|
0, 270270, 276480, 0x4ec4d57f
|
||||||
0, 547500, 276480, 0x04a8e3ee
|
0, 274024, 276480, 0xdf4e04d7
|
||||||
0, 555000, 276480, 0xa29f5b01
|
0, 277777, 276480, 0xbd98f57c
|
||||||
0, 562500, 276480, 0x754ceaf5
|
0, 281531, 276480, 0x7247ea3e
|
||||||
0, 570000, 276480, 0x5a38b4af
|
0, 285285, 276480, 0xa5d670ec
|
||||||
0, 577500, 276480, 0xfcebc261
|
0, 289039, 276480, 0x5163b29b
|
||||||
0, 585000, 276480, 0x3d3ca985
|
0, 292792, 276480, 0x99170e64
|
||||||
0, 592500, 276480, 0x94a03c75
|
0, 296546, 276480, 0x37f4c0b0
|
||||||
0, 600000, 276480, 0x2f98911c
|
0, 300300, 276480, 0x7a4f2561
|
||||||
0, 607500, 276480, 0x923b9937
|
0, 304053, 276480, 0x8a4e991f
|
||||||
0, 615000, 276480, 0xefab7ffd
|
0, 307807, 276480, 0x6a45425f
|
||||||
0, 622500, 276480, 0x6b9fbc80
|
0, 311561, 276480, 0x1f0e2bb6
|
||||||
0, 630000, 276480, 0xe4bdbd1e
|
0, 315315, 276480, 0xd75482c6
|
||||||
0, 637500, 276480, 0x225a56c0
|
0, 319068, 276480, 0x7bf6b1ef
|
||||||
0, 645000, 276480, 0xf58b1b7c
|
0, 322822, 276480, 0x6de1e34b
|
||||||
0, 652500, 276480, 0xbaffcdcc
|
0, 326576, 276480, 0x4526c89b
|
||||||
0, 660000, 276480, 0xeb6eb88f
|
0, 330330, 276480, 0xf964e18e
|
||||||
0, 667500, 276480, 0xdb753d35
|
0, 334083, 276480, 0xdcaaa99a
|
||||||
0, 675000, 276480, 0xea80a82e
|
0, 337837, 276480, 0xd1e98808
|
||||||
0, 682500, 276480, 0x2aae902a
|
0, 341591, 276480, 0x556b2365
|
||||||
0, 690000, 276480, 0x9b9ee961
|
0, 345345, 276480, 0x0cf65540
|
||||||
0, 697500, 276480, 0xaa12b6fd
|
0, 349098, 276480, 0x6e2d524e
|
||||||
0, 705000, 276480, 0x50c31e73
|
0, 352852, 276480, 0x22c50a3d
|
||||||
0, 712500, 276480, 0xdd9fb89f
|
0, 356606, 276480, 0x293f19af
|
||||||
0, 720000, 276480, 0xaf82399a
|
0, 360360, 276480, 0xf4b1c461
|
||||||
0, 727500, 276480, 0x7ce5f23c
|
0, 364113, 276480, 0x62b76407
|
||||||
0, 735000, 276480, 0x5aaa7519
|
0, 367867, 276480, 0x51e9b3eb
|
||||||
0, 742500, 276480, 0xe45a5599
|
0, 371621, 276480, 0x7b910bc7
|
||||||
0, 750000, 276480, 0x704411fb
|
0, 375375, 276480, 0x6dd14ca6
|
||||||
0, 757500, 276480, 0x9d7430a1
|
0, 379128, 276480, 0x441f7afd
|
||||||
0, 765000, 276480, 0x2c230702
|
0, 382882, 276480, 0xfb01efc6
|
||||||
0, 772500, 276480, 0x4a4f76cd
|
0, 386636, 276480, 0x4f73ccea
|
||||||
0, 780000, 276480, 0x27f54854
|
0, 390390, 276480, 0x5ac8e06f
|
||||||
0, 787500, 276480, 0x694d76e3
|
0, 394143, 276480, 0x294bb441
|
||||||
0, 795000, 276480, 0x525463e2
|
0, 397897, 276480, 0xe04ac45e
|
||||||
0, 802500, 276480, 0x819898f9
|
0, 401651, 276480, 0xa7a38d41
|
||||||
0, 810000, 276480, 0xeeed00fc
|
0, 405405, 276480, 0xf688a3ed
|
||||||
0, 817500, 276480, 0xb6f99ee3
|
0, 409158, 276480, 0x58f275ea
|
||||||
0, 825000, 276480, 0xefc83107
|
0, 412912, 276480, 0xf0b3b71b
|
||||||
0, 832500, 276480, 0xbb22e024
|
0, 416666, 276480, 0x3ce773bf
|
||||||
0, 840000, 276480, 0x300f922a
|
0, 420420, 276480, 0x01840548
|
||||||
0, 847500, 276480, 0x826fc3bd
|
0, 424173, 276480, 0x674e34e4
|
||||||
0, 855000, 276480, 0x679a53f8
|
0, 427927, 276480, 0x41dda2d9
|
||||||
0, 862500, 276480, 0x976c9e93
|
0, 431681, 276480, 0xc5b60838
|
||||||
0, 870000, 276480, 0xb194656e
|
0, 435435, 276480, 0x9b209f41
|
||||||
0, 877500, 276480, 0xf002c5ca
|
0, 439188, 276480, 0xf46ba7fb
|
||||||
0, 885000, 276480, 0xb243dda5
|
0, 442942, 276480, 0x28b54815
|
||||||
0, 892500, 276480, 0x1700efbb
|
0, 446696, 276480, 0xb605a933
|
||||||
0, 900000, 276480, 0x8f316c66
|
0, 450450, 276480, 0x34484aff
|
||||||
|
0, 454203, 276480, 0xaf2b5d89
|
||||||
|
0, 457957, 276480, 0x8facba58
|
||||||
|
0, 461711, 276480, 0xbbe3e99f
|
||||||
|
0, 465465, 276480, 0x02162c7c
|
||||||
|
0, 469218, 276480, 0x28a63236
|
||||||
|
0, 472972, 276480, 0x1ad43fd7
|
||||||
|
0, 476726, 276480, 0xe37883e5
|
||||||
|
0, 480480, 276480, 0x2b8a89c5
|
||||||
|
0, 484233, 276480, 0x71507bd2
|
||||||
|
0, 487987, 276480, 0x35626022
|
||||||
|
0, 491741, 276480, 0x461fc3e7
|
||||||
|
0, 495495, 276480, 0xce5af1ec
|
||||||
|
0, 499248, 276480, 0x7c1139b3
|
||||||
|
0, 503002, 276480, 0x7fd73a99
|
||||||
|
0, 506756, 276480, 0x4ae4c3a6
|
||||||
|
0, 510510, 276480, 0xcb60725a
|
||||||
|
0, 514263, 276480, 0xb52e1aa2
|
||||||
|
0, 518017, 276480, 0xd6f82cae
|
||||||
|
0, 521771, 276480, 0x6310e665
|
||||||
|
0, 525525, 276480, 0xfa88a483
|
||||||
|
0, 529278, 276480, 0xf88f75d4
|
||||||
|
0, 533032, 276480, 0x04a8e3ee
|
||||||
|
0, 536786, 276480, 0x54766a12
|
||||||
|
0, 540540, 276480, 0x0b41f0d7
|
||||||
|
0, 544293, 276480, 0xa29f5b01
|
||||||
|
0, 548047, 276480, 0x754ceaf5
|
||||||
|
0, 551801, 276480, 0x150c0423
|
||||||
|
0, 555555, 276480, 0xde084059
|
||||||
|
0, 559308, 276480, 0x5a38b4af
|
||||||
|
0, 563062, 276480, 0xfcebc261
|
||||||
|
0, 566816, 276480, 0x0eb9770d
|
||||||
|
0, 570570, 276480, 0x046394ae
|
||||||
|
0, 574323, 276480, 0x3d3ca985
|
||||||
|
0, 578077, 276480, 0x94a03c75
|
||||||
|
0, 581831, 276480, 0x800eea2d
|
||||||
|
0, 585585, 276480, 0x6a841f41
|
||||||
|
0, 589338, 276480, 0x2f98911c
|
||||||
|
0, 593092, 276480, 0x923b9937
|
||||||
|
0, 596846, 276480, 0xe82f8e0f
|
||||||
|
0, 600600, 276480, 0xee82d657
|
||||||
|
0, 604353, 276480, 0xefab7ffd
|
||||||
|
0, 608107, 276480, 0x6b9fbc80
|
||||||
|
0, 611861, 276480, 0x4a1ada47
|
||||||
|
0, 615614, 276480, 0x6d4b49d7
|
||||||
|
0, 619368, 276480, 0xe4bdbd1e
|
||||||
|
0, 623122, 276480, 0x225a56c0
|
||||||
|
0, 626876, 276480, 0xd4adadad
|
||||||
|
0, 630629, 276480, 0xff4e1a8c
|
||||||
|
0, 634383, 276480, 0xf58b1b7c
|
||||||
|
0, 638137, 276480, 0xbaffcdcc
|
||||||
|
0, 641891, 276480, 0x374f88f0
|
||||||
|
0, 645644, 276480, 0x3d861ae6
|
||||||
|
0, 649398, 276480, 0xeb6eb88f
|
||||||
|
0, 653152, 276480, 0xdb753d35
|
||||||
|
0, 656906, 276480, 0x9aa543af
|
||||||
|
0, 660659, 276480, 0xb24c8016
|
||||||
|
0, 664413, 276480, 0xea80a82e
|
||||||
|
0, 668167, 276480, 0x2aae902a
|
||||||
|
0, 671921, 276480, 0x5bba3cfb
|
||||||
|
0, 675674, 276480, 0x5c6e97a9
|
||||||
|
0, 679428, 276480, 0x9b9ee961
|
||||||
|
0, 683182, 276480, 0xaa12b6fd
|
||||||
|
0, 686936, 276480, 0xe9d2439f
|
||||||
|
0, 690689, 276480, 0xbf09053c
|
||||||
|
0, 694443, 276480, 0x50c31e73
|
||||||
|
0, 698197, 276480, 0xdd9fb89f
|
||||||
|
0, 701951, 276480, 0x3e4e5aec
|
||||||
|
0, 705704, 276480, 0x0b752d28
|
||||||
|
0, 709458, 276480, 0xaf82399a
|
||||||
|
0, 713212, 276480, 0x7ce5f23c
|
||||||
|
0, 716966, 276480, 0xad135d0f
|
||||||
|
0, 720719, 276480, 0x55dadd30
|
||||||
|
0, 724473, 276480, 0x5aaa7519
|
||||||
|
0, 728227, 276480, 0xe45a5599
|
||||||
|
0, 731981, 276480, 0xc8e89913
|
||||||
|
0, 735734, 276480, 0x2f447fd3
|
||||||
|
0, 739488, 276480, 0x704411fb
|
||||||
|
0, 743242, 276480, 0x9d7430a1
|
||||||
|
0, 746996, 276480, 0x24dd5fd3
|
||||||
|
0, 750749, 276480, 0x51cb657c
|
||||||
|
0, 754503, 276480, 0x2c230702
|
||||||
|
0, 758257, 276480, 0x4a4f76cd
|
||||||
|
0, 762011, 276480, 0xdcd71e88
|
||||||
|
0, 765764, 276480, 0x87160f99
|
||||||
|
0, 769518, 276480, 0x27f54854
|
||||||
|
0, 773272, 276480, 0x694d76e3
|
||||||
|
0, 777026, 276480, 0xcbe93c19
|
||||||
|
0, 780779, 276480, 0x50742e1b
|
||||||
|
0, 784533, 276480, 0x525463e2
|
||||||
|
0, 788287, 276480, 0x819898f9
|
||||||
|
0, 792041, 276480, 0x08fac755
|
||||||
|
0, 795794, 276480, 0x35c46927
|
||||||
|
0, 799548, 276480, 0xeeed00fc
|
||||||
|
0, 803302, 276480, 0xb6f99ee3
|
||||||
|
0, 807056, 276480, 0xd87f4c73
|
||||||
|
0, 810809, 276480, 0xde97d9fd
|
||||||
|
0, 814563, 276480, 0xefc83107
|
||||||
|
0, 818317, 276480, 0xbb22e024
|
||||||
|
0, 822071, 276480, 0x53a7cfcb
|
||||||
|
0, 825824, 276480, 0xbe1fbb19
|
||||||
|
0, 829578, 276480, 0x300f922a
|
||||||
|
0, 833332, 276480, 0x826fc3bd
|
||||||
|
0, 837086, 276480, 0x679aa57a
|
||||||
|
0, 840839, 276480, 0x5497097b
|
||||||
|
0, 844593, 276480, 0x679a53f8
|
||||||
|
0, 848347, 276480, 0x976c9e93
|
||||||
|
0, 852101, 276480, 0xe80f87f2
|
||||||
|
0, 855854, 276480, 0xdc2d7c6c
|
||||||
|
0, 859608, 276480, 0xb194656e
|
||||||
|
0, 863362, 276480, 0xf002c5ca
|
||||||
|
0, 867116, 276480, 0x43fc1c64
|
||||||
|
0, 870869, 276480, 0xf62d8581
|
||||||
|
0, 874623, 276480, 0xb243dda5
|
||||||
|
0, 878377, 276480, 0x1700efbb
|
||||||
|
0, 882131, 276480, 0x9ebe6ba2
|
||||||
|
0, 885884, 276480, 0x8f316c66
|
||||||
|
0, 889638, 276480, 0x6348ecf5
|
||||||
|
0, 893392, 276480, 0x34b5b78a
|
||||||
|
0, 897146, 276480, 0xcbf66922
|
||||||
|
|||||||
@ -1,46 +1,109 @@
|
|||||||
0, 0, 126720, 0xcefaec47
|
0, 0, 126720, 0xcefaec47
|
||||||
0, 7500, 126720, 0xa416ece5
|
0, 3003, 126720, 0xa416ece5
|
||||||
0, 15000, 126720, 0xa416ece5
|
0, 6006, 126720, 0xa416ece5
|
||||||
0, 22500, 126720, 0xa416ece5
|
0, 9009, 126720, 0xa416ece5
|
||||||
0, 30000, 126720, 0xcc10f4b7
|
0, 12012, 126720, 0x60d6ed27
|
||||||
0, 37500, 126720, 0xeb6fb8d7
|
0, 15015, 126720, 0x259af497
|
||||||
0, 45000, 126720, 0xda71b917
|
0, 18018, 126720, 0x5e6ff4d7
|
||||||
0, 52500, 126720, 0xbb1abbb7
|
0, 21021, 126720, 0xcc10f4b7
|
||||||
0, 60000, 126720, 0x273fbc37
|
0, 24024, 126720, 0x763ab817
|
||||||
0, 67500, 126720, 0x16eebbd7
|
0, 27027, 126720, 0xeb6fb8d7
|
||||||
0, 75000, 126720, 0x105eb927
|
0, 30030, 126720, 0xda71b917
|
||||||
0, 82500, 126720, 0x7fa3ae27
|
0, 33033, 126720, 0x0967b8f7
|
||||||
0, 90000, 126720, 0xd115a757
|
0, 36036, 126720, 0x4b62b947
|
||||||
0, 97500, 126720, 0x04e7897c
|
0, 39039, 126720, 0xbb1abbb7
|
||||||
0, 105000, 126720, 0x68cfda2b
|
0, 42042, 126720, 0x273fbc37
|
||||||
0, 112500, 126720, 0xe572dfc9
|
0, 45045, 126720, 0x16eebbd7
|
||||||
0, 120000, 126720, 0xbc3cc34f
|
0, 48048, 126720, 0x105eb927
|
||||||
0, 127500, 126720, 0xcf8cb0e2
|
0, 51051, 126720, 0x7fa3ae27
|
||||||
0, 135000, 126720, 0x75ae61b6
|
0, 54054, 126720, 0x722e99f7
|
||||||
0, 142500, 126720, 0x554fe3e4
|
0, 57057, 126720, 0x5ac9a827
|
||||||
0, 150000, 126720, 0x72ecea95
|
0, 60060, 126720, 0x07beba77
|
||||||
0, 157500, 126720, 0x5d00b5fe
|
0, 63063, 126720, 0x29d6a887
|
||||||
0, 165000, 126720, 0xe39bba0d
|
0, 66066, 126720, 0xa5caab87
|
||||||
0, 172500, 126720, 0x9c21bad8
|
0, 69069, 126720, 0x9ca7aac7
|
||||||
0, 180000, 126720, 0x72f2a47d
|
0, 72072, 126720, 0xb7debcd7
|
||||||
0, 187500, 126720, 0x4f639ebe
|
0, 75075, 126720, 0xd115a757
|
||||||
0, 195000, 126720, 0x534a10cc
|
0, 78078, 126720, 0x6ddaef32
|
||||||
0, 202500, 126720, 0xfdca11d3
|
0, 81081, 126720, 0xde1bb900
|
||||||
0, 210000, 126720, 0x0c735615
|
0, 84084, 126720, 0xac6c071b
|
||||||
0, 217500, 126720, 0x0eaf0c1b
|
0, 87087, 126720, 0x04e7897c
|
||||||
0, 225000, 126720, 0xce5e6794
|
0, 90090, 126720, 0x5eee050f
|
||||||
0, 232500, 126720, 0x14cf7974
|
0, 93093, 126720, 0xe675be59
|
||||||
0, 240000, 126720, 0xbc513f2a
|
0, 96096, 126720, 0xdc3e0837
|
||||||
0, 247500, 126720, 0xbc303fae
|
0, 99099, 126720, 0x68cfda2b
|
||||||
0, 255000, 126720, 0xd9f67585
|
0, 102102, 126720, 0xe572dfc9
|
||||||
0, 262500, 126720, 0x3378251f
|
0, 105105, 126720, 0x582fb176
|
||||||
0, 270000, 126720, 0xb3ed5911
|
0, 108108, 126720, 0xa9477df0
|
||||||
0, 277500, 126720, 0xc15a3577
|
0, 111111, 126720, 0xbc3cc34f
|
||||||
0, 285000, 126720, 0x0a24f256
|
0, 114114, 126720, 0xcf8cb0e2
|
||||||
0, 292500, 126720, 0xfab9c45d
|
0, 117117, 126720, 0xcff1db35
|
||||||
0, 300000, 126720, 0x45464610
|
0, 120120, 126720, 0xc6e10f9f
|
||||||
0, 307500, 126720, 0xfe2e057d
|
0, 123123, 126720, 0x75ae61b6
|
||||||
0, 315000, 126720, 0x23efdc35
|
0, 126126, 126720, 0x12af3119
|
||||||
0, 322500, 126720, 0x4d888b2e
|
0, 129129, 126720, 0x85597543
|
||||||
0, 330000, 126720, 0xdd0d74df
|
0, 132132, 126720, 0x68c27aca
|
||||||
0, 337500, 126720, 0x08382b8e
|
0, 135135, 126720, 0x554fe3e4
|
||||||
|
0, 138138, 126720, 0x72ecea95
|
||||||
|
0, 141141, 126720, 0xf4d003d1
|
||||||
|
0, 144144, 126720, 0x9bf6a605
|
||||||
|
0, 147147, 126720, 0x5d00b5fe
|
||||||
|
0, 150150, 126720, 0x93f7b040
|
||||||
|
0, 153153, 126720, 0x0d6ad154
|
||||||
|
0, 156156, 126720, 0x4be8b4ea
|
||||||
|
0, 159159, 126720, 0xe39bba0d
|
||||||
|
0, 162162, 126720, 0x9c21bad8
|
||||||
|
0, 165165, 126720, 0xa567f25b
|
||||||
|
0, 168168, 126720, 0x7a82663a
|
||||||
|
0, 171171, 126720, 0x72f2a47d
|
||||||
|
0, 174174, 126720, 0x4f639ebe
|
||||||
|
0, 177177, 126720, 0xab0fce83
|
||||||
|
0, 180180, 126720, 0x6cf87d39
|
||||||
|
0, 183183, 126720, 0x534a10cc
|
||||||
|
0, 186186, 126720, 0x6bbcf44c
|
||||||
|
0, 189189, 126720, 0xfdca11d3
|
||||||
|
0, 192192, 126720, 0x7e58f5a6
|
||||||
|
0, 195195, 126720, 0x5fd753d8
|
||||||
|
0, 198198, 126720, 0x0c735615
|
||||||
|
0, 201201, 126720, 0x2a034ebf
|
||||||
|
0, 204204, 126720, 0xeaf3dd0b
|
||||||
|
0, 207207, 126720, 0x0eaf0c1b
|
||||||
|
0, 210210, 126720, 0xce5e6794
|
||||||
|
0, 213213, 126720, 0xf27c31c3
|
||||||
|
0, 216216, 126720, 0xb64af168
|
||||||
|
0, 219219, 126720, 0x14cf7974
|
||||||
|
0, 222222, 126720, 0x1c2a513d
|
||||||
|
0, 225225, 126720, 0xa3f515ab
|
||||||
|
0, 228228, 126720, 0xcfd62765
|
||||||
|
0, 231231, 126720, 0xbc513f2a
|
||||||
|
0, 234234, 126720, 0xbc303fae
|
||||||
|
0, 237237, 126720, 0x2f8f69b9
|
||||||
|
0, 240240, 126720, 0x0a22cc69
|
||||||
|
0, 243243, 126720, 0xd9f67585
|
||||||
|
0, 246246, 126720, 0x20403001
|
||||||
|
0, 249249, 126720, 0xf92b2a25
|
||||||
|
0, 252252, 126720, 0x3c170aad
|
||||||
|
0, 255255, 126720, 0x3378251f
|
||||||
|
0, 258258, 126720, 0xb3ed5911
|
||||||
|
0, 261261, 126720, 0x35d24ef8
|
||||||
|
0, 264264, 126720, 0x8da30275
|
||||||
|
0, 267267, 126720, 0xc15a3577
|
||||||
|
0, 270270, 126720, 0xf2942f53
|
||||||
|
0, 273273, 126720, 0x44d8304a
|
||||||
|
0, 276276, 126720, 0xd688a932
|
||||||
|
0, 279279, 126720, 0x0a24f256
|
||||||
|
0, 282282, 126720, 0xfab9c45d
|
||||||
|
0, 285285, 126720, 0x10e939ce
|
||||||
|
0, 288288, 126720, 0x97fcaa3a
|
||||||
|
0, 291291, 126720, 0x45464610
|
||||||
|
0, 294294, 126720, 0xfe2e057d
|
||||||
|
0, 297297, 126720, 0x0b6718ae
|
||||||
|
0, 300300, 126720, 0x5284da7b
|
||||||
|
0, 303303, 126720, 0x23efdc35
|
||||||
|
0, 306306, 126720, 0xc387b2b3
|
||||||
|
0, 309309, 126720, 0xc9e92bf1
|
||||||
|
0, 312312, 126720, 0xfbf20a01
|
||||||
|
0, 315315, 126720, 0x4d888b2e
|
||||||
|
0, 318318, 126720, 0xdd0d74df
|
||||||
|
0, 321321, 126720, 0x49d07aa4
|
||||||
|
0, 324324, 126720, 0x08382b8e
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user