Menu
▾
▴
[Performous-commit] Lasse Karkkainen : Cleanup for ipu_decode.cpp. "Fixes" compile warnings. This should not affect behavior but no regression testing was done. The tool appears to be incomplete and not doing anything sensible anyway.
Author: Lasse Karkkainen <tro...@tr...>
Date: Fri Jul 6 04:39:32 2012 +0300
Cleanup for ipu_decode.cpp. "Fixes" compile warnings. This should not affect behavior but no regression testing was done. The tool appears to be incomplete and not doing anything sensible anyway.
---
tools/ipu_decode.cpp | 139 +++++++++++++++++++++-----------------------------
1 files changed, 59 insertions(+), 80 deletions(-)
diff --git a/tools/ipu_decode.cpp b/tools/ipu_decode.cpp
index 90373d3..e241130 100644
--- a/tools/ipu_decode.cpp
+++ b/tools/ipu_decode.cpp
@@ -1,4 +1,3 @@
-#include <cstdlib>
#include <fstream>
#include <iostream>
#include <stdexcept>
@@ -13,12 +12,13 @@
#define FPS 25
-struct IPUFile {
+struct IPUHeader {
unsigned int file_size;
unsigned short width;
unsigned short height;
unsigned int frames;
};
+
struct IPUFrame {
unsigned int id;
char mpeg1;
@@ -29,10 +29,6 @@ struct IPUFrame {
char idp;
};
-void convertFrame( std::vector<unsigned char> &buffer_in, std::vector<unsigned char> buffer_out, struct IPUFile ipu,struct IPUFrame frame) {
- // Do things here
-}
-
int intSwitch( int in ) {
int result=0;
result |= (0x000000ff&in)<<24;
@@ -42,31 +38,31 @@ int intSwitch( int in ) {
return result;
}
-void writeMpegHeader( std::ofstream &m_f2, char mpeg1, short width, short height ) {
+void writeMpegHeader( std::ofstream &mpegfile, char mpeg1, short width, short height ) {
unsigned int header;
header = 0xB3010000;
- m_f2.write((char*)&header,sizeof(int));
+ mpegfile.write((char*)&header,sizeof(int));
header = intSwitch(width * (1 << 20) + height * (1 << 8) + (1 << 4) + 3);
- m_f2.write((char*)&header,sizeof(int));
+ mpegfile.write((char*)&header,sizeof(int));
header = 0x00E1CE01;
- m_f2.write((char*)&header,sizeof(int));
+ mpegfile.write((char*)&header,sizeof(int));
if( !mpeg1 ) {
short tmp=0x0000;
header = 0xb5010000;
- m_f2.write((char*)&header,sizeof(int));
+ mpegfile.write((char*)&header,sizeof(int));
header = 0x01008A14;
- m_f2.write((char*)&header,sizeof(int));
- m_f2.write((char*)&tmp,sizeof(short));
+ mpegfile.write((char*)&header,sizeof(int));
+ mpegfile.write((char*)&tmp,sizeof(short));
header = 0xb5010000;
- m_f2.write((char*)&header,sizeof(int));
+ mpegfile.write((char*)&header,sizeof(int));
header = 0x04050523;
- m_f2.write((char*)&header,sizeof(int));
+ mpegfile.write((char*)&header,sizeof(int));
header = intSwitch(width * (1<<18) + (1<<17) + height * (1<<3));
- m_f2.write((char*)&header,sizeof(int));
+ mpegfile.write((char*)&header,sizeof(int));
}
}
-void writeGopHeader( std::ofstream &m_f2, unsigned int frame, char mpeg1, char idp, char qst,char ivf,char as ) {
+void writeGopHeader(std::ofstream& mpegfile, unsigned int frame, char mpeg1, char idp, char qst, char ivf, char as) {
unsigned int header;
int hours = frame / FPS / 60 / 60;
int minutes = (frame % (FPS * 60 * 60)) / FPS / 60;
@@ -74,70 +70,61 @@ void writeGopHeader( std::ofstream &m_f2, unsigned int frame, char mpeg1, char i
int ffs = frame % FPS;
header = 0xb8010000;
- m_f2.write((char*)&header,sizeof(int));
+ mpegfile.write((char*)&header,sizeof(int));
header = intSwitch(hours * (1<<26) + minutes * (1<<20) + (1<<19) + seconds * (1<<13) + ffs * (1<<7) + (1<<6));
- m_f2.write((char*)&header,sizeof(int));
+ mpegfile.write((char*)&header,sizeof(int));
header = 0x00010000;
- m_f2.write((char*)&header,sizeof(int));
+ mpegfile.write((char*)&header,sizeof(int));
header = 0xf8ff0f00;
- m_f2.write((char*)&header,sizeof(int));
+ mpegfile.write((char*)&header,sizeof(int));
if( !mpeg1 ) {
char tmp = 0x80;
header = 0xb5010000;
- m_f2.write((char*)&header,sizeof(int));
+ mpegfile.write((char*)&header,sizeof(int));
header = intSwitch(0x8ffff000 + (idp*(1<<10)+3*(1<<8)+(1<<6)+1+qst+ivf+as));
- m_f2.write((char*)&header,sizeof(int));
- m_f2.write(&tmp,sizeof(char));
+ mpegfile.write((char*)&header,sizeof(int));
+ mpegfile.write(&tmp,sizeof(char));
}
// Slice Header
short tmp = 0x0000;
- m_f2.write((char*)&tmp,sizeof(short));
+ mpegfile.write((char*)&tmp,sizeof(short));
header = 0x010C0101;
- m_f2.write((char*)&header,sizeof(int));
+ mpegfile.write((char*)&header,sizeof(int));
}
-void writeGopFooter( std::ofstream &m_f2 ) {
+void writeGopFooter( std::ofstream &mpegfile ) {
unsigned int header = 0x00000000;
char tmp = 0x00;
- m_f2.write((char*)&header,sizeof(int));
- m_f2.write((char*)&header,sizeof(int));
- m_f2.write((char*)&tmp,sizeof(char));
+ mpegfile.write((char*)&header,sizeof(int));
+ mpegfile.write((char*)&header,sizeof(int));
+ mpegfile.write((char*)&tmp,sizeof(char));
}
-int main( int argc, char** argv) {
- std::ifstream m_f1;
- std::ofstream m_f2;
- struct IPUFile ipu;
-
- if( argc < 3 ) {
+int main(int argc, char** argv) {
+ if (argc < 3) {
std::cout << "Usage: " << argv[0] << " input output" << std::endl;
- return EXIT_FAILURE;
+ return 1;
}
- m_f1.open(argv[1], std::ios::binary);
- m_f2.open(argv[2], std::ios::binary);
- if (!m_f1.is_open()) throw std::runtime_error("Could not open IPU file");
+ std::ifstream ipufile(argv[1], std::ios::binary);
+ std::ofstream mpegfile(argv[2], std::ios::binary);
+ if (!ipufile.is_open()) throw std::runtime_error("Could not open IPU file");
- m_f1.seekg(0x4, std::ios::cur);
- m_f1.read((char*)&ipu.file_size,sizeof(int));
- m_f1.read((char*)&ipu.width,sizeof(short));
- m_f1.read((char*)&ipu.height,sizeof(short));
- m_f1.read((char*)&ipu.frames,sizeof(int));
- ipu.file_size+=8; //Add header size (ipum and filesize)
+ // Read IPU header
+ IPUHeader ipu;
+ ipufile.seekg(0x4, std::ios::cur);
+ ipufile.read((char*)&ipu, sizeof(ipu));
+ ipu.file_size += 8; // Add header size (ipum and filesize)
std::cout << "FileSize: " << ipu.file_size << std::endl;
std::cout << "Geometry: " << ipu.width << "x" << ipu.height << std::endl;
std::cout << "Frames: " << ipu.frames << std::endl;
+ for (unsigned int i = 0; i < ipu.frames; ++i) {
+ std::vector<unsigned char> buffer_in, buffer_out;
+ char flags = ipufile.get();
- for( unsigned int i = 0 ; i < ipu.frames ; i++ ) {
- std::vector<unsigned char> buffer_in;
- std::vector<unsigned char> buffer_out;
- char flags;
- struct IPUFrame frame;
-
- m_f1.read(&flags,sizeof(char));
-
+ IPUFrame frame;
frame.id = i;
frame.mpeg1 = flags&FLAG_MPEG_TYPE;
frame.qst = flags&FLAG_MPEG_TYPE;
@@ -146,39 +133,31 @@ int main( int argc, char** argv) {
frame.dtd = flags&FLAG_DTD;
frame.idp = flags&FLAG_IDP;
- if( frame.id == 0 )
- writeMpegHeader(m_f2,frame.mpeg1,ipu.width,ipu.height);
+ if (frame.id == 0) writeMpegHeader(mpegfile, frame.mpeg1, ipu.width, ipu.height);
- writeGopHeader( m_f2, frame.id, frame.mpeg1,frame.idp,frame.qst,frame.ivf,frame.as);
- if( frame.ivf )
- std::cerr << "Intra VLC Format not supported" << std::endl;
+ writeGopHeader(mpegfile, frame.id, frame.mpeg1,frame.idp,frame.qst,frame.ivf,frame.as);
+
+ if (frame.ivf) std::cerr << "Intra VLC Format not supported" << std::endl;
- for( unsigned int j = 0 ; j < 4 ; j++ ) {
- unsigned char ch;
- m_f1.read((char*)&ch,sizeof(char));
- buffer_in.push_back(ch);
- }
- unsigned j = 3;
- while(1) {
+ for (unsigned j = 0; j < 4; ++j) buffer_in.push_back(ipufile.get());
+
+ for (unsigned j = 3;; ++j) {
unsigned char ch;
- if( buffer_in[j] == 0xb0 &&
- buffer_in[j-1] == 0x01 &&
- buffer_in[j-2] == 0x00 &&
- buffer_in[j-3] == 0x00 )
- break;
- m_f1.read((char*)&ch,sizeof(char));
+ if (buffer_in[j] == 0xb0 &&
+ buffer_in[j-1] == 0x01 &&
+ buffer_in[j-2] == 0x00 &&
+ buffer_in[j-3] == 0x00)
+ break;
+ ipufile.read((char*)&ch,sizeof(char));
buffer_in.push_back(ch);
- j++;
}
//std::cout << frame.id << ": " << buffer_in.size() << std::endl;
- convertFrame(buffer_in,buffer_out,ipu,frame);
- // m_f2.write(buffer_out); // pseudo-code
+ // FIXME: No implementation seemsto be written for this (and no data is ever output):
+ //convertFrame(buffer_in,buffer_out,ipu,frame);
+ // mpegfile.write(buffer_out); // pseudo-code
- writeGopFooter( m_f2 );
+ writeGopFooter(mpegfile);
}
-
- m_f1.close();
- m_f2.close();
- return EXIT_SUCCESS;
}
+
|