Skip to content

Commit 37601a8

Browse files
author
Clement Champetier
committed
data: Frame class describes raw data with an AVFrame
* Create decoded/coded folders to split classes in data directory. * Video/AudioFrameDesc are struct with puclic access to their attributes. * Sorry for this huge commit, but it is hard to split it.
1 parent d60088d commit 37601a8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+776
-690
lines changed

‎app/avPlay/Window.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -550,15 +550,15 @@ void Window::showAlphaChannelTexture()
550550

551551
void Window::displayNextFrame()
552552
{
553-
const char* buffer = (const char*)_reader->readNextFrame()->getData();
553+
const char* buffer = (const char*)_reader->readNextFrame()->getData()[0];
554554
loadNewTexture(buffer, _reader->getOutputNbComponents(), _reader->getOutputWidth(), _reader->getOutputHeight(), GL_RGB,
555555
GL_UNSIGNED_BYTE);
556556
display();
557557
}
558558

559559
void Window::displayPrevFrame()
560560
{
561-
const char* buffer = (const char*)_reader->readPrevFrame()->getData();
561+
const char* buffer = (const char*)_reader->readPrevFrame()->getData()[0];
562562
loadNewTexture(buffer, _reader->getOutputNbComponents(), _reader->getOutputWidth(), _reader->getOutputHeight(), GL_RGB,
563563
GL_UNSIGNED_BYTE);
564564
display();
@@ -571,7 +571,7 @@ void Window::displayFirstFrame()
571571

572572
void Window::displayAtFrame(const size_t frame)
573573
{
574-
const char* buffer = (const char*)_reader->readFrameAt(frame)->getData();
574+
const char* buffer = (const char*)_reader->readFrameAt(frame)->getData()[0];
575575
loadNewTexture(buffer, _reader->getOutputNbComponents(), _reader->getOutputWidth(), _reader->getOutputHeight(), GL_RGB,
576576
GL_UNSIGNED_BYTE);
577577
display();

‎src/AvTranscoder/codec/AudioCodec.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ AudioFrameDesc AudioCodec::getAudioFrameDesc() const
3030

3131
void AudioCodec::setAudioParameters(const AudioFrameDesc& audioFrameDesc)
3232
{
33-
_avCodecContext->sample_rate = audioFrameDesc.getSampleRate();
34-
_avCodecContext->channels = audioFrameDesc.getNbChannels();
35-
_avCodecContext->sample_fmt = audioFrameDesc.getSampleFormat();
33+
_avCodecContext->sample_rate = audioFrameDesc._sampleRate;
34+
_avCodecContext->channels = audioFrameDesc._nbChannels;
35+
_avCodecContext->sample_fmt = audioFrameDesc._sampleFormat;
3636
}
3737
}

‎src/AvTranscoder/codec/AudioCodec.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define _AV_TRANSCODER_CODEC_AUDIO_CODEC_HPP_
33

44
#include "ICodec.hpp"
5-
#include <AvTranscoder/data/AudioFrame.hpp>
5+
#include <AvTranscoder/data/decoded/AudioFrame.hpp>
66

77
namespace avtranscoder
88
{

‎src/AvTranscoder/codec/VideoCodec.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ VideoFrameDesc VideoCodec::getVideoFrameDesc() const
2727
VideoFrameDesc videoFrameDesc(_avCodecContext->width, _avCodecContext->height, _avCodecContext->pix_fmt);
2828
double fps = 1.0 * _avCodecContext->time_base.den / (_avCodecContext->time_base.num * _avCodecContext->ticks_per_frame);
2929
if(!std::isinf(fps))
30-
videoFrameDesc.setFps(fps);
30+
videoFrameDesc._fps = fps;
3131
return videoFrameDesc;
3232
}
3333

3434
void VideoCodec::setImageParameters(const VideoFrameDesc& videoFrameDesc)
3535
{
36-
_avCodecContext->width = videoFrameDesc.getWidth();
37-
_avCodecContext->height = videoFrameDesc.getHeight();
38-
_avCodecContext->pix_fmt = videoFrameDesc.getPixelFormat();
36+
_avCodecContext->width = videoFrameDesc._width;
37+
_avCodecContext->height = videoFrameDesc._height;
38+
_avCodecContext->pix_fmt = videoFrameDesc._pixelFormat;
3939
_avCodecContext->time_base.num = 1;
40-
_avCodecContext->time_base.den = videoFrameDesc.getFps();
40+
_avCodecContext->time_base.den = videoFrameDesc._fps;
4141
_avCodecContext->ticks_per_frame = 1;
4242
}
4343
}

‎src/AvTranscoder/codec/VideoCodec.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define _AV_TRANSCODER_CODEC_VIDEO_CODEC_HPP_
33

44
#include "ICodec.hpp"
5-
#include <AvTranscoder/data/VideoFrame.hpp>
5+
#include <AvTranscoder/data/decoded/VideoFrame.hpp>
66

77
namespace avtranscoder
88
{

‎src/AvTranscoder/data/AudioFrame.cpp

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎src/AvTranscoder/data/AudioFrame.hpp

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎src/AvTranscoder/data/Frame.hpp

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/AvTranscoder/data/VideoFrame.cpp

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎src/AvTranscoder/data/VideoFrame.hpp

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎src/AvTranscoder/data/CodedData.cpp renamed to ‎src/AvTranscoder/data/coded/CodedData.cpp

File renamed without changes.

0 commit comments

Comments
 (0)