cat/ChargeVideo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More namespacing ffmpeg stuff are now _ffmpeg

Browse Source
This commit is contained in:
Dora
2025-09-05 14:31:27 +03:00
parent 53c68fa564
commit 58d9b7ee5e
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/ChargeVideo.hpp
View File

@@ -14,7 +14,7 @@
#include <vector> #include <vector>
namespace ChargeVideo { namespace ChargeVideo {
namespace _dependencies { namespace _ffmpeg {
extern "C" { extern "C" {
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#include <libavcodec/codec.h> #include <libavcodec/codec.h>
@@ -29,12 +29,11 @@ extern "C" {
#include <libswresample/swresample.h> #include <libswresample/swresample.h>
#include <libswscale/swscale.h> #include <libswscale/swscale.h>
} }
} // namespace _dependencies } // namespace _ffmpeg
using namespace Corrade; using namespace Corrade;
using namespace Magnum; using namespace Magnum;
using namespace Math::Literals; using namespace Math::Literals;
using namespace _dependencies;
// ======================== CLASSES ======================== // ======================== CLASSES ========================
class Time { class Time {
public: public:
@@ -86,13 +85,13 @@ public:
private: private:
// Contextes // Contextes
AVFormatContext *ctx; _ffmpeg::AVFormatContext *ctx;
const AVCodec *vCodec; const _ffmpeg::AVCodec *vCodec;
const AVCodec *aCodec; const _ffmpeg::AVCodec *aCodec;
AVCodecContext *vCodecCtx, *aCodecCtx; _ffmpeg::AVCodecContext *vCodecCtx, *aCodecCtx;
AVStream *videoStream, *audioStream; _ffmpeg::AVStream *videoStream, *audioStream;
struct SwsContext *swsCtx = NULL; // Visual struct _ffmpeg::SwsContext *swsCtx = NULL; // Visual
struct SwrContext *swrCtx = NULL; // Audio struct _ffmpeg::SwrContext *swrCtx = NULL; // Audio
uint16_t ID = 0; uint16_t ID = 0;
// Time specific // Time specific
@@ -111,10 +110,11 @@ private:
bool frameSet = false; bool frameSet = false;
void continueVideo(); void continueVideo();
Containers::Array<char> loadNextFrame(); Containers::Array<char> loadNextFrame();
inline void frameDebug(AVFrame *frame); inline void frameDebug(_ffmpeg::AVFrame *frame);
inline void frameSetScaleSAR(AVFrame *frame); inline void frameSetScaleSAR(_ffmpeg::AVFrame *frame);
inline void frameConvert(AVFrame *sourceFrame, AVFrame *convertedFrame); inline void frameConvert(_ffmpeg::AVFrame *sourceFrame,
inline void frameFlip(AVFrame *frame); _ffmpeg::AVFrame *convertedFrame);
inline void frameFlip(_ffmpeg::AVFrame *frame);
inline void restartVideo(); inline void restartVideo();
void dumpAndRefillBuffer(); void dumpAndRefillBuffer();

2
src/Video.cpp
View File

@@ -1,4 +1,5 @@
#include "ChargeVideo.hpp" #include "ChargeVideo.hpp"
#include <Corrade/Utility/Utility.h> #include <Corrade/Utility/Utility.h>
#include <Magnum/GL/TextureFormat.h> #include <Magnum/GL/TextureFormat.h>
@@ -6,6 +7,7 @@
#include <Magnum/PixelFormat.h> #include <Magnum/PixelFormat.h>
using namespace ChargeVideo; using namespace ChargeVideo;
using namespace _ffmpeg;
#include <cstring> #include <cstring>
#include <string> #include <string>