Changeset 7997

Show
Ignore:
Timestamp:
07/08/08 11:46:56 (5 years ago)
Author:
hvolos
Message:

Undoing changes that were not supossed to be commited

Location:
experimental/components/FrameAssembler/branches/FrameAssembler-metadata/src
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • experimental/components/FrameAssembler/branches/FrameAssembler-metadata/src/FrameAssembler.cpp

    r7662 r7997  
    3434    num_frames_sent_app_1 = 0; 
    3535    num_frames_sent_app_2 = 0; 
    36     num_frames_sent_app_3 = 0; 
    3736    num_frames_sent_app_5 = 0; 
    3837    num_frames_sent_app_6 = 0; 
    … …  
    332331                    ConfigureFrameSize(512); 
    333332                    num_frames_sent_app_2++; 
    334                 } else if (metadata->app_id==3) { 
    335                     // audio data 
    336                     ConfigureFrameType(FRAME_TYPE_DATA); 
    337                     ///todo configure for BPSK 
    338                     if (metadata->modulation_scheme.M == 4) 
    339                         ConfigureFrameSize(90112);   // QPSK 
    340                     else 
    341                         ConfigureFrameSize(90112);   // 16-QAM 
    342                     num_frames_sent_app_3++; 
    343333                } else { 
    344334                    std::cerr << "ERROR! FrameAssembler: Unknown app_id: " 

  • experimental/components/FrameAssembler/branches/FrameAssembler-metadata/src/FrameAssembler.h

    r7662 r7997  
    9797    unsigned int num_frames_sent_app_1; 
    9898    unsigned int num_frames_sent_app_2; 
    99     unsigned int num_frames_sent_app_3; 
    10099    unsigned int num_frames_sent_app_5; 
    101100    unsigned int num_frames_sent_app_6; 

  • experimental/components/FrameAssembler/branches/FrameAssembler-metadata/src/FrameAssemblerDSP.h

    r7667 r7997  
    2929#include "PNCodes.h" 
    3030 
    31 #define FRAME_SIZE_1 2048   ///< Frame size option 1  
    32 #define FRAME_SIZE_2 90112  ///< Frame size option 2 %HV Modify for app 3 
    33 #define FRAME_SIZE_3 8192   ///< Frame size option 3  
     31#define FRAME_SIZE_1 2048   ///< Frame size option 1 
     32#define FRAME_SIZE_2 4096   ///< Frame size option 2 
     33#define FRAME_SIZE_3 8192   ///< Frame size option 3 
    3434#define FRAME_SIZE_4 512    ///< Frame size option 4 
    3535