Ticket #2581: aspectRatio-0-20-2.patch
File aspectRatio-0-20-2.patch, 10.2 KB (added by , 13 years ago) |
---|
-
libs/libmythtv/recordingprofile.cpp
434 434 }; 435 435 }; 436 436 437 class MPEG4AspectRatio: public CodecParam, public ComboBoxSetting { 438 public: 439 MPEG4AspectRatio(const RecordingProfile& parent): 440 CodecParam(parent, "mpeg4aspectratio") { 441 setLabel(QObject::tr("Aspect Ratio")); 442 addSelection("Leave", "Leave"); 443 addSelection("4:3", "4:3"); 444 addSelection("16:9", "16:9"); 445 setValue(0); 446 setHelpText(QObject::tr("Sets the aspect ratio of transcoded files")); 447 }; 448 }; 449 450 437 451 class EncodingThreadCount: public CodecParam, public SliderSetting { 438 452 public: 439 453 EncodingThreadCount(const RecordingProfile& parent): … … 581 595 params->addChild(new MPEG4MinQuality(parent)); 582 596 params->addChild(new MPEG4QualDiff(parent)); 583 597 params->addChild(new MPEG4ScaleBitrate(parent)); 598 params->addChild(new MPEG4AspectRatio(parent)); 584 599 585 600 HorizontalConfigurationGroup *hq; 586 601 hq = new HorizontalConfigurationGroup(false, false); -
programs/mythtranscode/transcode.cpp
388 388 int newWidth = video_width; 389 389 int newHeight = video_height; 390 390 391 392 if (video_height == 1088) { 393 VERBOSE(VB_IMPORTANT, "Found video height of 1088. This is unusual and " 394 "more than likely the video is actually 1080 so mythtranscode " 395 "will treat it as such."); 396 } 397 VERBOSE(VB_IMPORTANT, QString("Transcode: aspect ratio: %1").arg(video_aspect)); 398 399 /* this allows transcoders to have fixed aspect ratios */ 400 float newAspect = video_aspect; 401 /* these elements control the on screen cropping */ 402 int crop_top, crop_bottom, crop_left, crop_right; 403 crop_top = crop_bottom = crop_left = crop_right = 0; 404 391 405 kfa_table = new QPtrList<struct kfatable_entry>; 392 393 406 if (fifodir == NULL) 394 407 { 395 408 if (!GetProfile(profileName, encodingType)) { … … 415 428 } 416 429 else if (profile.byName("transcoderesize")->getValue().toInt()) 417 430 { 431 int actualHeight = (video_height == 1088 ? 1080 : video_height); 432 418 433 nvp->SetVideoFilters(vidfilters); 419 434 newWidth = profile.byName("width")->getValue().toInt(); 420 435 newHeight = profile.byName("height")->getValue().toInt(); 421 436 422 437 // If height or width are 0, then we need to calculate them 423 438 if (newHeight == 0 && newWidth > 0) 424 newHeight = (int)(1.0 * newWidth * video_height / video_width);439 newHeight = (int)(1.0 * newWidth * actualHeight / video_width); 425 440 else if (newWidth == 0 && newHeight > 0) 426 newWidth = (int)(1.0 * newHeight * video_width / video_height);441 newWidth = (int)(1.0 * newHeight * video_width / actualHeight); 427 442 else if (newWidth == 0 && newHeight == 0) 428 443 { 429 444 newHeight = 480; 430 newWidth = (int)(1.0 * 480 * video_width / video_height);445 newWidth = (int)(1.0 * 480 * video_width / actualHeight); 431 446 if (newWidth > 640) 432 447 { 433 448 newWidth = 640; 434 newHeight = (int)(1.0 * 640 * video_height / video_width);449 newHeight = (int)(1.0 * 640 * actualHeight / video_width); 435 450 } 436 451 } 437 452 /* hack by Patrick Wagstrom to ensure that aspect ratios are enforced 453 * if this is set to 43 then we crop the picture to fit the aspect ratio */ 454 if (vidsetting == "MPEG-4") 455 { 456 const Setting* setting = profile.byName("mpeg4aspectratio"); 457 if (setting) { 458 if (setting->getValue() == "4:3") { 459 VERBOSE(VB_IMPORTANT, QString("Transcoder calls for a 4:3 aspect ratio")); 460 newAspect = 1.333333333333; 461 } else if (setting->getValue() == "16:9") { 462 VERBOSE(VB_IMPORTANT, QString("Transcoder calls for a 16:9 aspect ratio")); 463 newAspect = 1.777777777777; 464 } else if (setting->getValue() == "Leave") { 465 VERBOSE(VB_IMPORTANT, QString("Transcoder leaves aspect ratio unchanged")); 466 } else { 467 VERBOSE(VB_IMPORTANT, QString("Transcode: unable to get aspect ratio")); 468 } 469 /* support for cropping... */ 470 if (abs(newAspect - video_aspect) > 0.01) { 471 if (abs(video_aspect - 1.77777) < 0.01) { 472 /* working with 16:9 source -- assume the height is correct */ 473 crop_left = (int)(video_width - (video_height * newAspect))/2; 474 crop_right = crop_left; 475 newWidth = (int)(newHeight * newAspect); 476 /* while we're at it, kill the noise on the top of th screen too */ 477 crop_top = crop_top + 8; 478 VERBOSE(VB_IMPORTANT, QString("Transcode: removing top 8 pixels to get rid of garbage from Comcast")); 479 } else if (abs(video_aspect - 1.33333) < 0.01) { 480 /* working with 4:3 source -- assume the width is correct */ 481 crop_top = (int)(video_height - (video_width / newAspect))/2; 482 crop_bottom = crop_top; 483 newHeight = (int)(newWidth / newAspect); 484 } 485 } 486 } else { 487 VERBOSE(VB_IMPORTANT, QString("Transcode: unable to get aspect ratio")); 488 } 489 } 490 438 491 if (encodingType.left(4).lower() == "mpeg") 439 492 { 440 493 // make sure dimensions are valid for MPEG codecs … … 445 498 VERBOSE(VB_IMPORTANT, QString("Resizing from %1x%2 to %3x%4") 446 499 .arg(video_width).arg(video_height) 447 500 .arg(newWidth).arg(newHeight)); 501 VERBOSE(VB_IMPORTANT, QString("Crop Settings %1 %2 %3 %4") 502 .arg(crop_left).arg(crop_right) 503 .arg(crop_top).arg(crop_bottom)); 448 504 } 449 505 else // lossy and no resize 450 506 nvp->SetVideoFilters(vidfilters); … … 469 525 SetProfileOption(profile, "mpeg4qualdiff"); 470 526 SetProfileOption(profile, "mpeg4optionvhq"); 471 527 SetProfileOption(profile, "mpeg4option4mv"); 472 528 nvr->SetupAVCodec(); 473 529 } 474 530 else if (vidsetting == "RTjpeg") 475 531 { … … 504 560 nvr->AudioInit(true); 505 561 506 562 nvr->SetFrameRate(video_frame_rate); 507 nvr->SetVideoAspect(video_aspect); 563 /* update the aspect to the new video aspect */ 564 nvr->SetVideoAspect(newAspect); 508 565 nvr->SetTranscoding(true); 509 566 510 567 outRingBuffer = new RingBuffer(outputname, true, false); … … 785 842 avpicture_fill(&imageIn, lastDecode->buf, PIX_FMT_YUV420P, 786 843 video_width, video_height); 787 844 avpicture_fill(&imageOut, frame.buf, PIX_FMT_YUV420P, 788 newWidth, newHeight); 789 scontext = img_resample_init(newWidth, newHeight, 790 video_width, video_height); 845 newWidth, newHeight); 846 if (video_height == 1088 && crop_bottom < 8) { 847 crop_bottom = 8; 848 } 849 scontext = img_resample_full_init(newWidth, newHeight, 850 video_width, video_height, 851 crop_top, crop_bottom, crop_left, crop_right, 852 0,0,0,0); 853 791 854 img_resample(scontext, &imageOut, &imageIn); 792 855 img_resample_close(scontext); 793 856 } … … 806 869 (frame.timecode - lasttimecode - (int)vidFrameTime); 807 870 } 808 871 809 if ( video_aspect != nvp->GetVideoAspect())872 if (newAspect != nvp->GetVideoAspect()) 810 873 { 811 video_aspect = nvp->GetVideoAspect(); 812 nvr->SetNewVideoParams(video_aspect); 874 // used to check video aspect 875 // video_aspect = nvp->GetVideoAspect(); 876 nvr->SetNewVideoParams(newAspect); 813 877 } 814 878 815 879 if (video_width != nvp->GetVideoWidth() || … … 820 884 VERBOSE(VB_IMPORTANT, QString("Resizing from %1x%2 to %3x%4") 821 885 .arg(video_width).arg(video_height) 822 886 .arg(newWidth).arg(newHeight)); 823 887 } 824 888 825 889 if ((video_width == newWidth) && (video_height == newHeight)) 826 890 { … … 832 896 video_width, video_height); 833 897 avpicture_fill(&imageOut, frame.buf, PIX_FMT_YUV420P, 834 898 newWidth, newHeight); 835 scontext = img_resample_init(newWidth, newHeight, 836 video_width, video_height); 899 if (video_height != 1088) { 900 scontext = img_resample_init(newWidth, newHeight, 901 video_width, video_height); 902 } 903 else 904 { 905 scontext = img_resample_full_init(newWidth, newHeight, 906 video_width, video_height, 907 0,8,0,0,0,0,0,0); 908 } 837 909 img_resample(scontext, &imageOut, &imageIn); 838 910 img_resample_close(scontext); 839 911 }