From a5fea58eeaff30d4bb4464c619af9d49faf425ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Fri, 4 Jul 2008 15:49:21 +0200
Subject: Improve header processing and misc cleanups.

When processing the header, read the whole 12-bytes block at once,
then use _x_is_fourcc() to check for the signatures, and only then try
to find the size.

--HG--
extra : transplant_source : %B8%90%00%DAJ%7F%3F%E4%00%05%07z%3D%C5%02%03v%A8%B4C
---
 src/demuxers/demux_eawve.c | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/demuxers/demux_eawve.c b/src/demuxers/demux_eawve.c
index 58ce4520f..7a21635cb 100644
--- a/src/demuxers/demux_eawve.c
+++ b/src/demuxers/demux_eawve.c
@@ -78,16 +78,16 @@ typedef struct {
  */
 
 static uint32_t read_arbitary(input_plugin_t *input){
-  uint8_t size, byte;
-  int i;
-  uint32_t word;
+  uint8_t size;
 
   if (input->read(input, (void*)&size, 1) != 1) {
     return 0;
   }
 
-  word = 0;
+  uint32_t word = 0;
+  int i;
   for (i=0;i<size;i++) {
+    uint8_t byte;
     if (input->read(input, (void*)&byte, 1) != 1) {
       return 0;
     }
@@ -104,33 +104,25 @@ static uint32_t read_arbitary(input_plugin_t *input){
  */
 
 static int process_header(demux_eawve_t *this){
-  int inHeader;
-  uint32_t blockid, size;
+  uint8_t header[12];
 
   if (this->input->get_current_pos(this->input) != 0)
     this->input->seek(this->input, 0, SEEK_SET);
 
-  if (this->input->read(this->input, (void*)&blockid, 4) != 4) {
-    return 0;
-  }
-  if (be2me_32(blockid) != FOURCC_TAG('S', 'C', 'H', 'l')) {
+  if (this->input->read(this->input, header, sizeof(header)) != sizeof(header))
     return 0;
-  }
 
-  if (this->input->read(this->input, (void*)&size, 4) != 4) {
+  if (!_x_is_fourcc(&header[0], "SCHl"))
     return 0;
-  }
-  size = le2me_32(size);
 
-  if (this->input->read(this->input, (void*)&blockid, 4) != 4) {
-    return 0;
-  }
-  if (be2me_32(blockid) != FOURCC_TAG('P', 'T', '\0', '\0')) {
+  if (!_x_is_fourcc(&header[8], "PT\0\0")) {
     lprintf("PT header missing\n");
     return 0;
   }
 
-  inHeader = 1;
+  const uint32_t size = _X_LE_32(&header[4]);
+
+  int inHeader = 1;
   while (inHeader) {
     int inSubheader;
     uint8_t byte;
-- 
cgit v1.2.3