Show
Ignore:
Timestamp:
08/02/08 16:24:20 (4 months ago)
Author:
astrange
Message:

Merge trunk to the branch.
Disable ssse3 qpel stuff (https://roundup.mplayerhq.hu/roundup/ffmpeg/issue463)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/perian-1.1

    • Property svn:externals changed from
      ffmpeg -r 13239 svn://svn.mplayerhq.hu/ffmpeg/trunk
      libebml -r 1306 https://services.corecodec.com/svn/matroska/trunk/libebml
      libmatroska -r 1306 https://services.corecodec.com/svn/matroska/trunk/libmatroska
      a52codec -r 64 http://svn.cod3r.com/a52codec/trunk
       to
      ffmpeg -r 14508 svn://svn.mplayerhq.hu/ffmpeg/trunk
      libebml -r 1306 https://services.corecodec.com/svn/matroska/trunk/libebml
      libmatroska -r 1306 https://services.corecodec.com/svn/matroska/trunk/libmatroska
      a52codec -r 64 http://svn.cod3r.com/a52codec/trunk

  • branches/perian-1.1/Subtitles/SubATSUIRenderer.m

    r902 r923  
    350350-(void*)completedStyleParsing:(SubStyle*)s 
    351351{ 
    352         const ATSUAttributeTag tags[] = {kATSUStyleRenderingOptionsTag, kATSUSizeTag, kATSUQDBoldfaceTag, kATSUQDItalicTag, kATSUQDUnderlineTag, kATSUStyleStrikeThroughTag, kATSUFontTag}; 
    353         const ByteCount          sizes[] = {sizeof(ATSStyleRenderingOptions), sizeof(Fixed), sizeof(Boolean), sizeof(Boolean), sizeof(Boolean), sizeof(Boolean), sizeof(ATSUFontID)}; 
    354          
    355         ATSUFontID font = GetFontIDForSSAName(s->fontname); 
     352        const ATSUAttributeTag tags[] = {kATSUStyleRenderingOptionsTag, kATSUSizeTag, kATSUQDBoldfaceTag, kATSUQDItalicTag, kATSUQDUnderlineTag, kATSUStyleStrikeThroughTag, kATSUFontTag, kATSUVerticalCharacterTag}; 
     353        const ByteCount          sizes[] = {sizeof(ATSStyleRenderingOptions), sizeof(Fixed), sizeof(Boolean), sizeof(Boolean), sizeof(Boolean), sizeof(Boolean), sizeof(ATSUFontID), sizeof(ATSUVerticalCharacterType)}; 
     354         
     355        NSString *fn = s->fontname; 
     356        ATSUVerticalCharacterType vertical = ParseFontVerticality(&fn) ? kATSUStronglyVertical : kATSUStronglyHorizontal; 
     357        ATSUFontID font = GetFontIDForSSAName(fn); 
    356358        ATSFontRef fontRef = font; 
    357359        ATSStyleRenderingOptions opt = kATSStyleApplyAntiAliasing; 
    …… 
    360362        ATSUStyle style; 
    361363                 
    362         const ATSUAttributeValuePtr vals[] = {&opt, &size, &b, &i, &u, &st, &font}; 
     364        const ATSUAttributeValuePtr vals[] = {&opt, &size, &b, &i, &u, &st, &font, &vertical}; 
    363365         
    364366        if (!s->platformSizeScale) s->platformSizeScale = GetWinFontSizeScale(fontRef); 
    …… 
    462464                        sv(); 
    463465                        { 
     466                                ATSUVerticalCharacterType vertical = ParseFontVerticality(&sval) ? kATSUStronglyVertical : kATSUStronglyHorizontal; 
    464467                                ATSUFontID font = GetFontIDForSSAName(sval); 
    465468                                 
    466                                 if (font) SetATSUStyleOther(spanEx->style, kATSUFontTag, sizeof(ATSUFontID), &font); 
     469                                if (font) { 
     470                                        SetATSUStyleFlag(spanEx->style, kATSUVerticalCharacterTag, vertical); 
     471                                        SetATSUStyleOther(spanEx->style, kATSUFontTag, sizeof(ATSUFontID), &font); 
     472                                } 
    467473                        } 
    468474                        break; 

  • branches/perian-1.1/Subtitles/SubContext.h

    r887 r923  
    5555 
    5656extern UInt8 SSA2ASSAlignment(UInt8 a); 
    57 void ParseASSAlignment(UInt8 a, UInt8 *alignH, UInt8 *alignV); 
     57extern void ParseASSAlignment(UInt8 a, UInt8 *alignH, UInt8 *alignV); 
    5858extern SubRGBAColor ParseSSAColor(unsigned rgb); 
     59extern BOOL ParseFontVerticality(NSString **fontname); 

  • branches/perian-1.1/Subtitles/SubContext.m

    r893 r923  
    6262                case 3: case 6: case 9: *alignH = kSubAlignmentRight; break; 
    6363        } 
     64} 
     65 
     66BOOL ParseFontVerticality(NSString **fontname) 
     67{ 
     68        if ([*fontname characterAtIndex:0] == '@') { 
     69                *fontname = [*fontname substringFromIndex:1]; 
     70                return YES; 
     71        } 
     72        return NO; 
    6473} 
    6574 

  • branches/perian-1.1/Subtitles/SubImport.mm

    r902 r923  
    10461046{ 
    10471047        priv = [[SubSerializer alloc] init]; 
     1048    CFRetain(priv); 
    10481049} 
    10491050 
    10501051CXXSubSerializer::~CXXSubSerializer() 
    10511052{ 
    1052         if (priv) {[(SubSerializer*)priv release]; priv = NULL;} 
     1053        if (priv) {CFRelease(priv); [(SubSerializer*)priv release]; priv = NULL;} 
    10531054} 
    10541055 

  • branches/perian-1.1/Subtitles/SubUtilities.m

    r887 r923  
    141141} 
    142142 
    143 CFMutableStringRef GetHomeDirectory() 
     143CFMutableStringRef CopyHomeDirectory() 
    144144{ 
    145145        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];