/*
- * AVISynth support for ffmpeg system
+ * AviSynth support
* Copyright (c) 2006 DivX, Inc.
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * 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.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * 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 FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
+#include "internal.h"
#include "riff.h"
#include <windows.h>
DWORD read;
LONG chunck_size;
LONG chunck_samples;
-} AVISynthStream;
+} AviSynthStream;
typedef struct {
PAVIFILE file;
AVISynthStream *streams;
int nb_streams;
int next_stream;
-} AVISynthContext;
+} AviSynthContext;
-static int avisynth_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int avisynth_read_header(AVFormatContext *s)
{
- AVISynthContext *avs = s->priv_data;
+ AviSynthContext *avs = s->priv_data;
HRESULT res;
AVIFILEINFO info;
DWORD id;
AVStream *st;
- AVISynthStream *stream;
+ AviSynthStream *stream;
+ wchar_t filename_wchar[1024] = { 0 };
+ char filename_char[1024] = { 0 };
AVIFileInit();
- res = AVIFileOpen(&avs->file, s->filename, OF_READ|OF_SHARE_DENY_WRITE, NULL);
+ /* AviSynth cannot accept UTF-8 file names. */
+ MultiByteToWideChar(CP_UTF8, 0, s->filename, -1, filename_wchar, 1024);
+ WideCharToMultiByte(CP_THREAD_ACP, 0, filename_wchar, -1, filename_char, 1024, NULL, NULL);
+ res = AVIFileOpen(&avs->file, filename_char, OF_READ|OF_SHARE_DENY_WRITE, NULL);
if (res != S_OK)
{
av_log(s, AV_LOG_ERROR, "AVIFileOpen failed with error %ld", res);
return -1;
}
- avs->streams = av_mallocz(info.dwStreams * sizeof(AVISynthStream));
+ avs->streams = av_mallocz(info.dwStreams * sizeof(AviSynthStream));
for (id=0; id<info.dwStreams; id++)
{
if (AVIStreamReadFormat(stream->handle, 0, &wvfmt, &struct_size) != S_OK)
continue;
- st = av_new_stream(s, id);
- st->codec->codec_type = CODEC_TYPE_AUDIO;
+ st = avformat_new_stream(s, NULL);
+ st->id = id;
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->block_align = wvfmt.nBlockAlign;
st->codec->channels = wvfmt.nChannels;
st->codec->sample_rate = wvfmt.nSamplesPerSec;
st->codec->bit_rate = wvfmt.nAvgBytesPerSec * 8;
- st->codec->bits_per_sample = wvfmt.wBitsPerSample;
+ st->codec->bits_per_coded_sample = wvfmt.wBitsPerSample;
stream->chunck_samples = wvfmt.nSamplesPerSec * (uint64_t)info.dwScale / (uint64_t)info.dwRate;
stream->chunck_size = stream->chunck_samples * wvfmt.nChannels * wvfmt.wBitsPerSample / 8;
st->codec->codec_tag = wvfmt.wFormatTag;
- st->codec->codec_id = wav_codec_get_id(wvfmt.wFormatTag, st->codec->bits_per_sample);
+ st->codec->codec_id = ff_wav_codec_get_id(wvfmt.wFormatTag, st->codec->bits_per_coded_sample);
}
else if (stream->info.fccType == streamtypeVIDEO)
{
if (AVIStreamReadFormat(stream->handle, 0, &imgfmt, &struct_size) != S_OK)
continue;
- st = av_new_stream(s, id);
- st->codec->codec_type = CODEC_TYPE_VIDEO;
- st->r_frame_rate.num = stream->info.dwRate;
- st->r_frame_rate.den = stream->info.dwScale;
+ st = avformat_new_stream(s, NULL);
+ st->id = id;
+ st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+ st->avg_frame_rate.num = stream->info.dwRate;
+ st->avg_frame_rate.den = stream->info.dwScale;
st->codec->width = imgfmt.bmiHeader.biWidth;
st->codec->height = imgfmt.bmiHeader.biHeight;
- st->codec->bits_per_sample = imgfmt.bmiHeader.biBitCount;
+ st->codec->bits_per_coded_sample = imgfmt.bmiHeader.biBitCount;
st->codec->bit_rate = (uint64_t)stream->info.dwSampleSize * (uint64_t)stream->info.dwRate * 8 / (uint64_t)stream->info.dwScale;
st->codec->codec_tag = imgfmt.bmiHeader.biCompression;
- st->codec->codec_id = codec_get_id(codec_bmp_tags, imgfmt.bmiHeader.biCompression);
+ st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, imgfmt.bmiHeader.biCompression);
st->duration = stream->info.dwLength;
}
st->codec->stream_codec_tag = stream->info.fccHandler;
- av_set_pts_info(st, 64, info.dwScale, info.dwRate);
+ avpriv_set_pts_info(st, 64, info.dwScale, info.dwRate);
st->start_time = stream->info.dwStart;
}
}
static int avisynth_read_packet(AVFormatContext *s, AVPacket *pkt)
{
- AVISynthContext *avs = s->priv_data;
+ AviSynthContext *avs = s->priv_data;
HRESULT res;
- AVISynthStream *stream;
+ AviSynthStream *stream;
int stream_id = avs->next_stream;
LONG read_size;
static int avisynth_read_close(AVFormatContext *s)
{
- AVISynthContext *avs = s->priv_data;
+ AviSynthContext *avs = s->priv_data;
int i;
for (i=0;i<avs->nb_streams;i++)
static int avisynth_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags)
{
- AVISynthContext *avs = s->priv_data;
+ AviSynthContext *avs = s->priv_data;
int stream_id;
for (stream_id = 0; stream_id < avs->nb_streams; stream_id++)
return 0;
}
-AVInputFormat avisynth_demuxer = {
- "avs",
- NULL_IF_CONFIG_SMALL("AVISynth"),
- sizeof(AVISynthContext),
- NULL,
- avisynth_read_header,
- avisynth_read_packet,
- avisynth_read_close,
- avisynth_read_seek,
- NULL,
- 0,
- "avs",
+AVInputFormat ff_avisynth_demuxer = {
+ .name = "avisynth",
+ .long_name = NULL_IF_CONFIG_SMALL("AviSynth"),
+ .priv_data_size = sizeof(AviSynthContext),
+ .read_header = avisynth_read_header,
+ .read_packet = avisynth_read_packet,
+ .read_close = avisynth_read_close,
+ .read_seek = avisynth_read_seek,
+ .extensions = "avs",
};
projects / ffmpeg / blobdiff