From a8fa4b49ae54ebd814d48f92a918a4f49cbfca8a Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Monteiro Date: Mon, 29 Oct 2007 18:48:02 +0000 Subject: [PATCH] Applied 2points' patch for keyframe support in AVI files in Unix systems Originally committed to SVN as r1640. --- aegisub/Makefile.am | 3 ++- aegisub/lavc_keyframes.cpp | 54 ++++++++++++++++++++++++++++++++++++++ aegisub/lavc_keyframes.h | 54 ++++++++++++++++++++++++++++++++++++++ aegisub/video_context.cpp | 12 +++++++-- 4 files changed, 120 insertions(+), 3 deletions(-) create mode 100644 aegisub/lavc_keyframes.cpp create mode 100644 aegisub/lavc_keyframes.h diff --git a/aegisub/Makefile.am b/aegisub/Makefile.am index 11f193221..989ebbdba 100644 --- a/aegisub/Makefile.am +++ b/aegisub/Makefile.am @@ -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 \ diff --git a/aegisub/lavc_keyframes.cpp b/aegisub/lavc_keyframes.cpp new file mode 100644 index 000000000..03d3f8f88 --- /dev/null +++ b/aegisub/lavc_keyframes.cpp @@ -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 +#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(); +}; diff --git a/aegisub/lavc_keyframes.h b/aegisub/lavc_keyframes.h new file mode 100644 index 000000000..03d3f8f88 --- /dev/null +++ b/aegisub/lavc_keyframes.h @@ -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 +#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(); +}; diff --git a/aegisub/video_context.cpp b/aegisub/video_context.cpp index dc1136039..51e43ebe5 100644 --- a/aegisub/video_context.cpp +++ b/aegisub/video_context.cpp @@ -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__