Implement n bits per pixel in Frame to buffer and from buffer
This commit is contained in:
1 parent
a38f9c3283
commit
c8079e87cb
8 files changed
+181
-111
No files matched your search
@@ -235,7 +235,7 @@ FramePropertiesSideBar::FramePropertiesSideBar( QWidget* parent, Bool* pbMainPla
|
||||
connect( renderingButtonGroup, SIGNAL( buttonClicked(int) ), this, SLOT( slotRenderingChanged(int) ) );
|
||||
connect( histogramWidget, SIGNAL( signalIntervalChanged( int, int ) ), this, SLOT( slotUpdateInterval(int, int) ) );
|
||||
connect( histogramWidget, SIGNAL( signalMaximumValueChanged(int) ), this, SLOT( slotUpdateIntervRange(int) ) );
|
||||
connect( histogramWidget, SIGNAL( signalHistogramComputationDone(bool) ), this, SLOT( slotRefreshOptions(bool) ) );
|
||||
connect( histogramWidget, SIGNAL( signalHistogramComputationDone(int) ), this, SLOT( slotRefreshOptions(int) ) );
|
||||
connect( histogramWidget, SIGNAL( signalHistogramComputationFailed(void) ), this, SLOT( slotHistogramComputationFailed(void) ) );
|
||||
connect( minInterv, SIGNAL( valueChanged (int) ), this, SLOT( slotMinValueChanged(int) ) );
|
||||
connect( maxInterv, SIGNAL( valueChanged (int) ), this, SLOT( slotMaxValueChanged(int) ) );
|
||||
@@ -339,9 +339,6 @@ Void FramePropertiesSideBar::setData( PlaYUVerFrame* pcFrame, Bool isPlaying )
|
||||
colorsLabel->hide();
|
||||
}
|
||||
}
|
||||
UInt rangePel = ( 1 << pcFrame->getBitsPel() ) - 1;
|
||||
minInterv->setRange( 0, rangePel );
|
||||
maxInterv->setRange( 0, rangePel );
|
||||
setEnabled( true );
|
||||
if( m_pcFrame || !( *pbMainPlaySwitch ) )
|
||||
{
|
||||
@@ -456,7 +453,7 @@ Void FramePropertiesSideBar::stopHistogram()
|
||||
// SLOTS
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
Void FramePropertiesSideBar::slotRefreshOptions( bool /*depth*/)
|
||||
Void FramePropertiesSideBar::slotRefreshOptions( int range )
|
||||
{
|
||||
if( !isVisible() )
|
||||
return;
|
||||
|
||||
@@ -116,7 +116,7 @@ private:
|
||||
Void updateDataHistogram();
|
||||
|
||||
private Q_SLOTS:
|
||||
void slotRefreshOptions( bool sixteenBit );
|
||||
void slotRefreshOptions( int range );
|
||||
void slotHistogramComputationFailed( void );
|
||||
void slotChannelChanged( int channel );
|
||||
void slotScaleChanged( int scale );
|
||||
|
||||
@@ -125,7 +125,7 @@ public:
|
||||
HistogramWidgetPrivate()
|
||||
{
|
||||
blinkTimer = 0;
|
||||
sixteenBits = false;
|
||||
imageBits = 8;
|
||||
inSelected = false;
|
||||
blinkFlag = false;
|
||||
clearFlag = HistogramNone;
|
||||
@@ -146,7 +146,7 @@ public:
|
||||
// Image informations
|
||||
Int imageChannels;
|
||||
Int imageColorSpace;
|
||||
bool sixteenBits;
|
||||
Int imageBits;
|
||||
|
||||
bool guideVisible; // Display color guide.
|
||||
bool statisticsVisible; // Display tooltip histogram statistics.
|
||||
@@ -313,7 +313,7 @@ Void HistogramWidget::customEvent( QEvent *event )
|
||||
setUpdatesEnabled( false );
|
||||
|
||||
notifyValuesChanged();
|
||||
emit signalHistogramComputationDone( d->sixteenBits );
|
||||
emit signalHistogramComputationDone( d->range );
|
||||
|
||||
setUpdatesEnabled( true );
|
||||
update();
|
||||
@@ -397,7 +397,7 @@ Void HistogramWidget::stopHistogramComputation()
|
||||
|
||||
Void HistogramWidget::updateData( const PlaYUVerFrame *pcFrame, const PlaYUVerFrame *pcFrameSelection )
|
||||
{
|
||||
d->sixteenBits = false;
|
||||
d->imageBits = pcFrame->getBitsPel();
|
||||
//d->imageColorSpace = image.getPelFormat();
|
||||
d->imageColorSpace = pcFrame->getColorSpace();
|
||||
d->imageChannels = pcFrame->getNumberChannels();
|
||||
@@ -409,7 +409,7 @@ Void HistogramWidget::updateData( const PlaYUVerFrame *pcFrame, const PlaYUVerFr
|
||||
// Do not using PlaYUVerFrameStatistics::getHistogramSegment()
|
||||
// method here because histogram hasn't yet been computed.
|
||||
|
||||
d->range = d->sixteenBits ? 65535 : 255;
|
||||
d->range = ( 1 << d->imageBits ) - 1;
|
||||
emit signalMaximumValueChanged( d->range );
|
||||
|
||||
m_imageHistogram = ( PlaYUVerFrameStats* )pcFrame;
|
||||
|
||||
@@ -152,7 +152,7 @@ public:
|
||||
Q_SIGNALS:
|
||||
void signalIntervalChanged( int min, int max );
|
||||
void signalMaximumValueChanged( int );
|
||||
void signalHistogramComputationDone( bool );
|
||||
void signalHistogramComputationDone( int );
|
||||
void signalHistogramComputationFailed( void );
|
||||
|
||||
public Q_SLOTS:
|
||||
|
||||
@@ -43,8 +43,8 @@ QDataStream& operator<<( QDataStream& out, const PlaYUVerStreamInfoVector& array
|
||||
out << d.m_cFilename << d.m_uiWidth
|
||||
<< d.m_uiHeight
|
||||
<< d.m_iPelFormat
|
||||
<< d.m_uiFrameRate
|
||||
<< d.m_uiBitsPelPixel
|
||||
<< d.m_uiFrameRate
|
||||
<< d.m_uiFileSize;
|
||||
}
|
||||
return out;
|
||||
|
||||
Reference in new issue
Block a user