[svn] / branches / dev-api-4 / xvidcore / src / bitstream / bitstream.c Repository:
ViewVC logotype

Diff of /branches/dev-api-4/xvidcore/src/bitstream/bitstream.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1235, Wed Dec 3 02:22:30 2003 UTC revision 1238, Wed Dec 3 19:46:50 2003 UTC
# Line 20  Line 20 
20   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
21   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
22   *   *
23   * $Id: bitstream.c,v 1.39.2.21 2003-12-03 02:22:30 Isibaar Exp $   * $Id: bitstream.c,v 1.39.2.22 2003-12-03 19:46:50 edgomez Exp $
24   *   *
25   ****************************************************************************/   ****************************************************************************/
26    
# Line 1081  Line 1081 
1081          static const unsigned int vol_id = 0;          static const unsigned int vol_id = 0;
1082          int vol_ver_id = 1;          int vol_ver_id = 1;
1083          int vol_type_ind = VIDOBJLAY_TYPE_SIMPLE;          int vol_type_ind = VIDOBJLAY_TYPE_SIMPLE;
1084            int vol_profile = pParam->profile;
1085    
1086          if ( (pParam->vol_flags & XVID_VOL_QUARTERPEL) ||          if ( (pParam->vol_flags & XVID_VOL_QUARTERPEL) ||
1087           (pParam->vol_flags & XVID_VOL_GMC) ||           (pParam->vol_flags & XVID_VOL_GMC) ||
# Line 1106  Line 1107 
1107           * byte aligned, and that always 1-8 padding bits have been written           * byte aligned, and that always 1-8 padding bits have been written
1108           */           */
1109    
1110        if (!vol_profile) {
1111                    /* Profile was not set by client app, use the more permissive profile
1112                     * compatible with the vol_type_id */
1113                    switch(vol_type_ind) {
1114                    case VIDOBJLAY_TYPE_ASP:
1115                            vol_profile = 0xf5; /* ASP level 5 */
1116                            break;
1117                    case VIDOBJLAY_TYPE_ART_SIMPLE:
1118                            vol_profile = 0x94; /* ARTS level 4 */
1119                            break;
1120                    default:
1121                            vol_profile = 0x03; /* Simple level 3 */
1122                            break;
1123                    }
1124            }
1125    
1126            /* Write the VOS header */
1127      BitstreamPutBits(bs, VISOBJSEQ_START_CODE, 32);      BitstreamPutBits(bs, VISOBJSEQ_START_CODE, 32);
1128      BitstreamPutBits(bs, pParam->profile, 8);          BitstreamPutBits(bs, vol_profile, 8);   /* profile_and_level_indication */
1129    
1130    
1131          /* visual_object_start_code */          /* visual_object_start_code */
1132          BitstreamPad(bs);          BitstreamPad(bs);

Legend:
Removed from v.1235  
changed lines
  Added in v.1238

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4