mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Applied 2points' patch for keyframe support in AVI files in Unix systems

Browse source 
Originally committed to SVN as r1640.
This commit is contained in:
Rodrigo Braz Monteiro 2007-10-29 18:48:02 +00:00
parent 67b15eacd4
commit a8fa4b49ae
4 changed files with 120 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
aegisub/Makefile.am
View file

@ -55,7 +55,7 @@ HUNSPELL=
endif
if HAVE_FFMPEG
FFMPEG=audio_provider_lavc.cpp lavc_file.cpp video_provider_lavc.cpp
FFMPEG=audio_provider_lavc.cpp lavc_file.cpp video_provider_lavc.cpp lavc_keyframes.cpp
else
FFMPEG=
endif
@ -83,6 +83,7 @@ EXTRA_aegisub_SOURCES = \
dialog_associations.cpp \
factory.h \
lavc_file.cpp \
lavc_keyframes.cpp \
setup.cpp \
spellchecker_hunspell.cpp \
stdwx.cpp \

54
aegisub/lavc_keyframes.cpp Normal file
View file

@ -0,0 +1,54 @@
// Copyright (c) 2007, 2points
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of the Aegisub Group nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
// -----------------------------------------------------------------------------
//
// AEGISUB
//
// Website: http://aegisub.cellosoft.com
// Contact: mailto:zeratul@cellosoft.com
//
#pragma once
#include <wx/wxprec.h>
#include "lavc_file.h"
class LAVCKeyFrames {
private:
LAVCFile* file; // Video file
AVCodecContext* codecContext; // Codec context
AVCodec* codec; // Used codec
AVStream* stream; // Used stream
AVFrame* frame; // Frame buffer
int streamN; // Stream index
public:
LAVCKeyFrames(const wxString& filename);
~LAVCKeyFrames();
wxArrayInt GetKeyFrames();
};

54
aegisub/lavc_keyframes.h Normal file
View file

@ -0,0 +1,54 @@
// Copyright (c) 2007, 2points
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of the Aegisub Group nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
// -----------------------------------------------------------------------------
//
// AEGISUB
//
// Website: http://aegisub.cellosoft.com
// Contact: mailto:zeratul@cellosoft.com
//
#pragma once
#include <wx/wxprec.h>
#include "lavc_file.h"
class LAVCKeyFrames {
private:
LAVCFile* file; // Video file
AVCodecContext* codecContext; // Codec context
AVCodec* codec; // Used codec
AVStream* stream; // Used stream
AVFrame* frame; // Frame buffer
int streamN; // Stream index
public:
LAVCKeyFrames(const wxString& filename);
~LAVCKeyFrames();
wxArrayInt GetKeyFrames();
};

12
aegisub/video_context.cpp
View file

@ -62,6 +62,9 @@
#include "ass_style.h"
#include "subs_grid.h"
#include "vfw_wrap.h"
#ifndef __WINDOWS__
#include "lavc_keyframes.h"
#endif
#include "mkv_wrap.h"
#include "options.h"
#include "subs_edit_box.h"
@ -282,12 +285,17 @@ void VideoContext::SetVideo(const wxString &filename) {
// Close mkv
MatroskaWrapper::wrapper.Close();
}
#ifdef __WINDOWS__
else if (ext == _T(".avi")) {
#ifdef __WINDOWS__
KeyFrames = VFWWrapper::GetKeyFrames(filename);
#else
LAVCKeyFrames k(filename);
KeyFrames = k.GetKeyFrames();
#endif
keyFramesLoaded = true;
}
#endif
// Set GL context
#ifdef __WXMAC__